diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-05 13:49:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-05 13:50:03 (GMT) |
| commit | f7d29c0b9aae2ee250b1dc3dd3bc903cce2011b4 (patch) | |
| tree | ab93d69c5a3fb8ac8bc6ccf1dfd33f55c678fd2c /Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake | |
| parent | 4ffa4ddd8078918583fc03302fa3c3db2c1ca733 (diff) | |
| parent | d210b2813072c874ee13fcc941e41aacacf09874 (diff) | |
| download | CMake-f7d29c0b9aae2ee250b1dc3dd3bc903cce2011b4.zip CMake-f7d29c0b9aae2ee250b1dc3dd3bc903cce2011b4.tar.gz CMake-f7d29c0b9aae2ee250b1dc3dd3bc903cce2011b4.tar.bz2 | |
Merge topic 'xcode9-ios-tests'
d210b281 Xcode: Adjust tests to drop of 32bit iOS architectures
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1347
Diffstat (limited to 'Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake')
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake index a797410..f629f2e 100644 --- a/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake @@ -6,7 +6,11 @@ set(CMAKE_OSX_SYSROOT iphoneos) set(XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") -set(CMAKE_OSX_ARCHITECTURES "armv7;i386") +if(XCODE_VERSION VERSION_GREATER_EQUAL 9) + set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") +else() + set(CMAKE_OSX_ARCHITECTURES "armv7;i386") +endif() add_library(foo STATIC foo.cpp) install(TARGETS foo ARCHIVE DESTINATION lib) |