From 5ee6a0dddad933161a5a8783afa8d65611d06272 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 16 Mar 2021 15:13:15 +0100 Subject: [PATCH] Fix installation of Find*.cmake files in shadow per-repo builds In shadow per-repo builds we never hit the code that is supposed to install cmake/Find*.cmake files. This caused problems when statically building a Qt repo like qtshadertools against qtimageformats which provides such Find*.cmake files. Fixes: QTBUG-91538 Change-Id: I1147daee817ac71303d93e8bf368b2769afb0bb4 Reviewed-by: Craig Scott Reviewed-by: Alexandru Croitor (cherry picked from commit 232c70ecc85243205d4cdd62b6d31dcc32dafeba) --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 5d8903f90a7..af8c3d18c4a 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -408,7 +408,7 @@ macro(qt_build_repo_end) qt_path_join(__qt_repo_install_dir ${QT_CONFIG_INSTALL_DIR} ${INSTALL_CMAKE_NAMESPACE}) if(NOT PROJECT_NAME STREQUAL "QtBase") - if (EXISTS cmake) + if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake") qt_copy_or_install(DIRECTORY cmake/ DESTINATION "${__qt_repo_install_dir}" FILES_MATCHING PATTERN "Find*.cmake"