git.iko.soy/unity8
on xenial help sign in
Use $<TARGET_FILE:> generator instead of querying IMPORTED_LOCATION
2fd8763Michał Sawicz
cmake/modules/QmlPlugins.cmake+1−3
compare with xenial
unifiedsplit
@@ -107,8 +107,6 @@ macro(export_qmlplugin PLUGIN VERSION PATH)
107 set(multi TARGETS)
107 set(multi TARGETS)
108 cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})
108 cmake_parse_arguments(QMLPLUGIN "${options}" "${single}" "${multi}" ${ARGN})
109
109
110− get_target_property(qmlplugindump_executable qmlplugindump LOCATION)
111−
112 if(QMLPLUGIN_BINARY_DIR)
110 if(QMLPLUGIN_BINARY_DIR)
113 set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
111 set(qmlplugin_dir ${QMLPLUGIN_BINARY_DIR}/${PATH})
114 else()
112 else()
@@ -127,7 +125,7 @@ macro(export_qmlplugin PLUGIN VERSION PATH)
127 set(qmltypes_path ${CMAKE_CURRENT_SOURCE_DIR}/${plugin_suffix}.qmltypes)
125 set(qmltypes_path ${CMAKE_CURRENT_SOURCE_DIR}/${plugin_suffix}.qmltypes)
128
126
129 add_custom_target(${target_prefix}-qmltypes
127 add_custom_target(${target_prefix}-qmltypes
130− COMMAND env ${QMLPLUGIN_ENVIRONMENT} ${qmlplugindump_executable} -notrelocatable
128+ COMMAND env ${QMLPLUGIN_ENVIRONMENT} $<TARGET_FILE:qmlplugindump> -notrelocatable
131 ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}
129 ${PLUGIN} ${VERSION} ${QMLPLUGIN_MODULE_DIR} > ${qmltypes_path}
132 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
130 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
133 )
131 )