diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-06 14:25:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-06 14:25:31 (GMT) |
| commit | 973ccc52afeb547cb3e1848a77efbb0be008c10c (patch) | |
| tree | 0026a8381976b7a1413b66c3a24236af03a09135 /Tests | |
| parent | 668bee3099e8dcfed7e38f1323886ee45bac5bf9 (diff) | |
| parent | 429522e89c5322d19d6215cfb7e6a76a74d84874 (diff) | |
| download | CMake-973ccc52afeb547cb3e1848a77efbb0be008c10c.zip CMake-973ccc52afeb547cb3e1848a77efbb0be008c10c.tar.gz CMake-973ccc52afeb547cb3e1848a77efbb0be008c10c.tar.bz2 | |
Merge topic 'ci-xcode-13.0'
429522e89c gitlab-ci: update macOS jobs to use Xcode 13.0
75901f0472 Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6578
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake index a1c0671..53b885d 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake @@ -9,8 +9,8 @@ function(verify_architectures file) return() endif() - string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out}) - string(REPLACE "architecture " "" actual "${architectures}") + string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out}) + string(REPLACE "\narchitecture " "" actual "${architectures}") list(SORT actual) set(expected arm64 armv7 i386 x86_64) diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake index 83da17d..37bb4d5 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake @@ -9,8 +9,8 @@ function(verify_architectures file) return() endif() - string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out}) - string(REPLACE "architecture " "" actual "${architectures}") + string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out}) + string(REPLACE "\narchitecture " "" actual "${architectures}") list(SORT actual) set(expected armv7 x86_64) |