diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-21 13:56:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-06-21 13:56:09 (GMT) |
| commit | 621f7bf2e536e0618ab9e1e51bf96578f8783411 (patch) | |
| tree | 35534fb9b63a0be3f68c28f4f8ad6c07713d173e | |
| parent | d6c0cc16815e635e8095c68d6239a37d73fe6479 (diff) | |
| parent | 1dd0eae4fc54e2c15176088ac6b9b7b42802b6f6 (diff) | |
| download | CMake-621f7bf2e536e0618ab9e1e51bf96578f8783411.zip CMake-621f7bf2e536e0618ab9e1e51bf96578f8783411.tar.gz CMake-621f7bf2e536e0618ab9e1e51bf96578f8783411.tar.bz2 | |
Merge branch 'test-xcode-13' into release-3.20
Merge-request: !6248
| -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 8e7c04f..bb83fea 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}") |