diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-21 14:00:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-21 14:01:25 (GMT) |
| commit | 782b6bfc26587e353011cf2e96a5e731839dabe1 (patch) | |
| tree | 26d7149ec07f3f4c747fe7e2698621671e9bc38d /Tests | |
| parent | 6438a03c730eac731a18e6919b057acd736b1e5b (diff) | |
| parent | 1dd0eae4fc54e2c15176088ac6b9b7b42802b6f6 (diff) | |
| download | CMake-782b6bfc26587e353011cf2e96a5e731839dabe1.zip CMake-782b6bfc26587e353011cf2e96a5e731839dabe1.tar.gz CMake-782b6bfc26587e353011cf2e96a5e731839dabe1.tar.bz2 | |
Merge topic 'test-xcode-13' into release-3.21
1dd0eae4fc Tests: Fix xcode version detection for Xcode 13 on ARM
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6248
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index c2576f3..7fddf4b 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -8,7 +8,7 @@ if(APPLE) else() execute_process( COMMAND xcodebuild -version - OUTPUT_VARIABLE _version ERROR_VARIABLE _version + OUTPUT_VARIABLE _version ERROR_VARIABLE _version_err ) if(_version MATCHES "^Xcode ([0-9]+(\\.[0-9]+)*)") set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 2f9b7ff..6d73554 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -321,7 +321,7 @@ if(BUILD_TESTING) else() execute_process( COMMAND xcodebuild -version - OUTPUT_VARIABLE _version ERROR_VARIABLE _version + OUTPUT_VARIABLE _version ERROR_VARIABLE _version_err ) if(_version MATCHES "^Xcode ([0-9]+(\\.[0-9]+)*)") set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}") |