diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-06 19:06:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-06 20:59:25 (GMT) |
| commit | 49996faaac552cf80cb2de53e0719bc6ba43432a (patch) | |
| tree | 75cda8af71e9b5f8f63d618495d8402e71ff3dc9 /Tests/RunCMake/NinjaMultiConfig | |
| parent | 3e791592ad44a6d44599bda346c85983e6fe89eb (diff) | |
| download | CMake-49996faaac552cf80cb2de53e0719bc6ba43432a.zip CMake-49996faaac552cf80cb2de53e0719bc6ba43432a.tar.gz CMake-49996faaac552cf80cb2de53e0719bc6ba43432a.tar.bz2 | |
ci: remove ISPC from the Fedora CI image
Revert commit 5ece12b7e4 (gitlab-ci: add ISPC to the Fedora CI image,
2020-08-18, v3.19.0-rc1~244^2). Later we will download ISPC in specific
jobs.
Update a `RunCMake.NinjaMultiConfig` test expectation to account for
a change to the Qt deployed on Fedora 36.
Diffstat (limited to 'Tests/RunCMake/NinjaMultiConfig')
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index 919015f..dbc3151 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$|\\.pdb$|\\.exp$|/install_manifest\\.txt$") + list(FILTER actual EXCLUDE REGEX "/CMakeFiles/|\\.ninja$|/CMakeCache\\.txt$|/target_files[^/]*\\.cmake$|/\\.ninja_[^/]*$|/cmake_install\\.cmake$|\\.ilk$|\\.manifest$|\\.pdb$|\\.exp$|/install_manifest\\.txt$|/\\.qt/QtDeploySupport[^/]*\\.cmake$") foreach(f IN LISTS _check_files_INCLUDE _check_files_EXCLUDE) if(EXISTS ${f}) list(APPEND actual ${f}) |