mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix RunCMake.XcodeProject XcodeIOSInstallCombined cases for Xcode 13.0

Browse Source 
The output of `otool -vf` now contains additional content that happens
to be matched by our architectures regex.  Make the regex more strict.
This commit is contained in:
Brad King
2021-09-30 11:46:56 -04:00
parent 0e86fea0be
commit 75901f0472
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake
+2 -2
View File
@@ -9,8 +9,8 @@ function(verify_architectures file)
return() return()
endif() endif()
string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out}) string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out})
string(REPLACE "architecture " "" actual "${architectures}") string(REPLACE "\narchitecture " "" actual "${architectures}")
list(SORT actual) list(SORT actual)
set(expected arm64 armv7 i386 x86_64) set(expected arm64 armv7 i386 x86_64)
Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake
+2 -2
View File
@@ -9,8 +9,8 @@ function(verify_architectures file)
return() return()
endif() endif()
string(REGEX MATCHALL "architecture [^ \n\t]+" architectures ${otool_out}) string(REGEX MATCHALL "\narchitecture [^ \n\t()]+" architectures ${otool_out})
string(REPLACE "architecture " "" actual "${architectures}") string(REPLACE "\narchitecture " "" actual "${architectures}")
list(SORT actual) list(SORT actual)
set(expected armv7 x86_64) set(expected armv7 x86_64)