summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-06-27 15:10:14 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-06-27 15:11:05 (GMT)
commit764c8c9036f1662c2e43e3e2f0f61845587e294d (patch)
tree2da91c107477864040cd905e7b3ee678030c93d1 /Tests
parent6935ff7df04c38611eba7b807b9360ed2226bb7c (diff)
parent8a68ad5233e856b1044a0ce9f0431950795ed764 (diff)
downloadCMake-764c8c9036f1662c2e43e3e2f0f61845587e294d.zip
CMake-764c8c9036f1662c2e43e3e2f0f61845587e294d.tar.gz
CMake-764c8c9036f1662c2e43e3e2f0f61845587e294d.tar.bz2
Merge topic 'test-autogen-nmc'
8a68ad5233 Autogen: Filter out QtDeployTargets from Ninja Multi-Config tests Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9627
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
index 88fd1e8..f1e8b30 100644
--- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
@@ -17,7 +17,7 @@ function(check_files dir)
list(SORT expected)
file(GLOB_RECURSE actual "${dir}/*")
- list(FILTER actual EXCLUDE REGEX "/CMakeFiles/|\\.ninja$|/CMakeCache\\.txt$|/target_files[^/]*\\.cmake$|/\\.ninja_[^/]*$|/cmake_install\\.cmake$|\\.ilk$|\\.manifest$|\\.odx$|\\.pdb$|\\.exp$|/install_manifest\\.txt$|/\\.qt/QtDeploySupport[^/]*\\.cmake$")
+ list(FILTER actual EXCLUDE REGEX "/CMakeFiles/|\\.ninja$|/CMakeCache\\.txt$|/target_files[^/]*\\.cmake$|/\\.ninja_[^/]*$|/cmake_install\\.cmake$|\\.ilk$|\\.manifest$|\\.odx$|\\.pdb$|\\.exp$|/install_manifest\\.txt$|/\\.qt/(QtDeploySupport|QtDeployTargets)[^/]*\\.cmake$")
foreach(f IN LISTS _check_files_INCLUDE _check_files_EXCLUDE)
if(EXISTS ${f})
list(APPEND actual ${f})