diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-10 13:10:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-10 13:10:05 (GMT) |
| commit | 60c688c6c37e9867462950c2fb2be7f3aef756b4 (patch) | |
| tree | 05aca7572b3a5f669e8b431f1799b04683cb9fb4 /Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake | |
| parent | f3bbb37b253a1f4a26809d6f132b3996aa2e16fc (diff) | |
| parent | 3a49b4eb78a123e1b809ed57dd888d362aac2cb2 (diff) | |
| download | CMake-60c688c6c37e9867462950c2fb2be7f3aef756b4.zip CMake-60c688c6c37e9867462950c2fb2be7f3aef756b4.tar.gz CMake-60c688c6c37e9867462950c2fb2be7f3aef756b4.tar.bz2 | |
Merge topic 'xcode-tests-ios-deployment-target'
3a49b4eb Xcode 9: Lower iOS deployment version to get armv7 builds
78a560e4 Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1365
Diffstat (limited to 'Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake')
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake index 6abba49..fc830b1 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake @@ -7,11 +7,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") -if(XCODE_VERSION VERSION_GREATER_EQUAL 9) - set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") -else() - set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64") -endif() +set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64") add_executable(foo_app MACOSX_BUNDLE main.cpp) install(TARGETS foo_app BUNDLE DESTINATION bin) |