summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-03-21 15:56:31 +0100
committerAlexey Edelev <alexey.edelev@qt.io>2022-03-22 09:58:27 +0000
commit2905cb06ccbf91623d46661989935e934362b840 (patch)
treeee321c1ef5dc98f5b5dcea9fc58290036afeb76b
parent938feab4380a7da949ffa753957c05876bd86130 (diff)
Install QtCopyFileIfDifferent as the 'public' cmake helper
QtCopyFileIfDifferent needs to be both installed and copied to a build folder as a public CMake helper. Otherwise it's not found when building tests inside the Qt build tree. Fixes: QTBUG-101916 Change-Id: I8d081e594fe694f528ebac4c13bbdf6d3b8402b9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit ea30708972d37063b3fb79162483d85c5d5cb1a0)
-rw-r--r--cmake/QtBaseGlobalTargets.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
index 5aa1349949..ca85e0424f 100644
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -218,7 +218,6 @@ qt_copy_or_install(FILES
cmake/QtCompilerFlags.cmake
cmake/QtCompilerOptimization.cmake
cmake/QtConfigDependencies.cmake.in
- cmake/QtCopyFileIfDifferent.cmake
cmake/QtDeferredDependenciesHelpers.cmake
cmake/QtDbusHelpers.cmake
cmake/QtDocsHelpers.cmake
@@ -298,6 +297,7 @@ qt_copy_or_install(DIRECTORY
# Usually we put such functions into Qt6CoreMacros.cmake, but that's getting bloated.
# These files will be included by Qt6Config.cmake.
set(__public_cmake_helpers
+ cmake/QtCopyFileIfDifferent.cmake
cmake/QtFeature.cmake
cmake/QtFeatureCommon.cmake
cmake/QtPublicCMakeHelpers.cmake