From f4cc885f8cfd5cb552aed1efbadaa07e83b012d4 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Fri, 30 Jun 2023 15:24:54 +0200 Subject: [PATCH] CMake: Avoid creating empty directories when installing Find*.cmake Surprisingly, CMake copy/install empty directories when `file` or `install` are used with `FILES_MATCHING PATTERN` argument. In order to avoid this, we can exclude the empty directories using a PATTERN EXCLUDE argument. Change-Id: I17a22f9b9e317bc4a66cee3df39815659ddb4c04 Reviewed-by: Alexandru Croitor Reviewed-by: Alexey Edelev (cherry picked from commit 86e0c111fd0b9a2c2becb4e37199e9091e883fde) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBaseGlobalTargets.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 5ac19a9ba33..eb99e18794a 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -375,6 +375,10 @@ qt_copy_or_install(DIRECTORY cmake/ FILES_MATCHING PATTERN "Find*.cmake" PATTERN "tests" EXCLUDE PATTERN "3rdparty" EXCLUDE + PATTERN "macos" EXCLUDE + PATTERN "ios" EXCLUDE + PATTERN "platforms" EXCLUDE + PATTERN "QtBuildInternals" EXCLUDE ) # In prefix builds we also need to copy the files into the build config directory, so that the @@ -385,6 +389,10 @@ if(QT_WILL_INSTALL) FILES_MATCHING PATTERN "Find*.cmake" PATTERN "tests" EXCLUDE PATTERN "3rdparty" EXCLUDE + PATTERN "macos" EXCLUDE + PATTERN "ios" EXCLUDE + PATTERN "platforms" EXCLUDE + PATTERN "QtBuildInternals" EXCLUDE ) endif()