diff options
| author | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2019-11-21 13:33:28 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-08 10:42:21 +0000 |
| commit | ea81b69cde70316b5b5b161d8fb9bf904b229523 (patch) | |
| tree | e975067776a96a05c63e1a7c9d36c56a2ce93acc /cmake/QtBaseGlobalTargets.cmake | |
| parent | a182efb9c42630171879497efd05b5a5e644cf60 (diff) | |
Implement qtbase fixes for superbuilds
Change-Id: I0d3445cf0740e3925fa9342dac4d07892518afe5
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake/QtBaseGlobalTargets.cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 037faa0e65..5f38f96681 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -203,6 +203,7 @@ qt_internal_export_modern_cmake_config_targets_file(TARGETS ${__export_targets} qt_copy_or_install(FILES cmake/ModuleDescription.json.in cmake/QtBuild.cmake + cmake/QtBuildInformation.cmake cmake/QtCompilerFlags.cmake cmake/QtCompilerOptimization.cmake cmake/QtFeature.cmake @@ -221,13 +222,8 @@ qt_copy_or_install(FILES cmake/QtPluginDependencies.cmake.in DESTINATION "${__GlobalConfig_install_dir}" ) -if(QT_WILL_INSTALL) - # NOTE: QtFeature.cmake is included by the Qt module config files unconditionally - # In a prefix build, QtFeature.cmake is not copied to the build dir by default - # Thus do it explicitly in that case so we can use the module config files in the examples - file(COPY cmake/QtFeature.cmake DESTINATION "${__GlobalConfig_install_dir}") -endif() +file(COPY cmake/QtFeature.cmake DESTINATION "${__GlobalConfig_build_dir}") # TODO: Check whether this is the right place to install these qt_copy_or_install(DIRECTORY cmake/3rdparty DESTINATION "${__GlobalConfig_install_dir}") |