diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-09 18:23:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-05-10 14:04:48 (GMT) |
| commit | 6aae34ec53daf92a5ff272fb56757109003edb99 (patch) | |
| tree | bff4eeb423d6864ae449b9af3f477517e47b0706 /Tests | |
| parent | 25eddc2ef3a5ced7851b1c3795a46ac3364c18f1 (diff) | |
| download | CMake-6aae34ec53daf92a5ff272fb56757109003edb99.zip CMake-6aae34ec53daf92a5ff272fb56757109003edb99.tar.gz CMake-6aae34ec53daf92a5ff272fb56757109003edb99.tar.bz2 | |
Tests: Fix RunCMake.XcodeProject XcodeSchemaGeneration case on arm64
Explicitly specify the xcodebuild scheme destination architecture to
match the host.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 75f2d35..ae7bdeb 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -672,6 +672,7 @@ endif() if(XCODE_VERSION) add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION} + -DCMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR} -DCMake_TEST_Swift=${CMake_TEST_Swift}) add_RunCMake_test(XcodeProject-Embed -DXCODE_VERSION=${XCODE_VERSION}) diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 3910127..61f7c40 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -101,7 +101,7 @@ function(XcodeSchemaGeneration) run_cmake(XcodeSchemaGeneration) if (XCODE_VERSION VERSION_GREATER_EQUAL 13) - set(maybe_destination -destination platform=macOS) + set(maybe_destination -destination platform=macOS,arch=${CMAKE_HOST_SYSTEM_PROCESSOR}) else() set(maybe_destination "") endif() |