diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-12-05 16:02:26 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-12-05 15:09:50 +0000 |
| commit | 05ba991d39a84bb4dfea27aa423c329449d23d46 (patch) | |
| tree | d8a0de55d39520ae798e815567e3e430a9bae366 | |
| parent | f4e80ea688cd1b35b35d8247f819b047517f4cdc (diff) | |
Fix meta types json file install for non-prefix builds
Change-Id: I76fd379dacb7db79d4ed6ca47954ae8e703842d4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index fa71968ae1..0840a9bd78 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1706,9 +1706,18 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})") get_target_property(target_metatypes_file ${target} QT_MODULE_META_TYPES_FILE) if (target_metatypes_file) set(metatypes_install_dir ${INSTALL_LIBDIR}/metatypes) - qt_copy_or_install(FILES ${target_metatypes_file} + qt_install(FILES ${target_metatypes_file} DESTINATION ${metatypes_install_dir} ) + # For non prefix builds + if(NOT QT_WILL_INSTALL) + get_filename_component(file_name ${target_metatypes_file} NAME) + set(copy_destination ${QT_BUILD_DIR}/${metatypes_install_dir}/${file_name}) + add_custom_command(TARGET ${target} POST_BUILD + COMMAND ${CMAKE_COMMAND} + -E copy_if_different ${target_metatypes_file} ${copy_destination} + ) + endif() endif() endif() endfunction() |