on xenial help sign in
Respect BINARY_DIR for targets in export_qml*.
commitd60d8607065724d866d0c114e8feb96b816c4bf4 authorMichał Sawicz <michal.sawicz@canonical.com> dateThu 15 May 2014, 16:56 (12 years ago) parentf2d60db
1 file changed+8
cmake/modules/QmlPlugins.cmake+8
cmake/modules/QmlPlugins.cmake+8
@@ -54,6 +54,8 @@ macro(export_qmlfiles PLUGIN PATH)
5454 ${QMLFILES_SEARCH_PATH}/qmldir
5555 )
5656
57+ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${qmlfiles_dir})
58+
5759 # copy the files
5860 add_custom_target(${QMLFILES_TARGET_PREFIX}${PLUGIN}-qmlfiles ALL
5961 COMMAND cp ${QMLFILES} ${qmlfiles_dir}
@@ -126,6 +128,12 @@ macro(export_qmlplugin PLUGIN VERSION PATH)
126128 endif()
127129 endif()
128130
131+ set_target_properties(${QMLPLUGIN_TARGETS} PROPERTIES
132+ ARCHIVE_OUTPUT_DIRECTORY ${qmlplugin_dir}
133+ LIBRARY_OUTPUT_DIRECTORY ${qmlplugin_dir}
134+ RUNTIME_OUTPUT_DIRECTORY ${qmlplugin_dir}
135+ )
136+
129137 if (QMLPLUGIN_DESTINATION)
130138 # Install additional targets
131139 install(TARGETS ${QMLPLUGIN_TARGETS}