diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-06 14:24:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-06 14:24:15 (GMT) |
| commit | 5eef6ca26da9ed2ddd424d4d69bd4fd20933a9fd (patch) | |
| tree | f760b191a0b329f1e189f3299ccc6d05c1f8f9ad | |
| parent | 15f405cdf1bceca83450e2f5db5238ca15dd1083 (diff) | |
| parent | 0e86fea0bee63592e024c330b22939ec7846712e (diff) | |
| download | CMake-5eef6ca26da9ed2ddd424d4d69bd4fd20933a9fd.zip CMake-5eef6ca26da9ed2ddd424d4d69bd4fd20933a9fd.tar.gz CMake-5eef6ca26da9ed2ddd424d4d69bd4fd20933a9fd.tar.bz2 | |
Merge topic 'xcode13-schema' into release-3.21
0e86fea0be Tests: Specify destination for Xcode scheme
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6582
| -rw-r--r-- | Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index ed8e725..fa26c3d 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -91,7 +91,12 @@ function(XcodeSchemaGeneration) file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") run_cmake(XcodeSchemaGeneration) - run_cmake_command(XcodeSchemaGeneration-build xcodebuild -scheme foo build) + if (XCODE_VERSION VERSION_GREATER_EQUAL 13) + set(maybe_destination -destination platform=macOS) + else() + set(maybe_destination "") + endif() + run_cmake_command(XcodeSchemaGeneration-build xcodebuild -scheme foo ${maybe_destination} build) endfunction() if(NOT XCODE_VERSION VERSION_LESS 7) |