mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 05:40:54 -06:00
Xcode 9: Lower iOS deployment version to get armv7 builds
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
include(RunCMake)
|
||||
|
||||
if(XCODE_VERSION VERSION_GREATER_EQUAL 9)
|
||||
set(IOS_DEPLOYMENT_TARGET "-DCMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET=10")
|
||||
endif()
|
||||
|
||||
run_cmake(XcodeFileType)
|
||||
run_cmake(XcodeAttributeLocation)
|
||||
run_cmake(XcodeAttributeGenex)
|
||||
@@ -20,7 +24,9 @@ run_cmake(PerConfigPerSourceFlags)
|
||||
if(NOT XCODE_VERSION VERSION_LESS 5)
|
||||
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeInstallIOS-build)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install")
|
||||
set(RunCMake_TEST_OPTIONS
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_BINARY_DIR}/ios_install"
|
||||
"${IOS_DEPLOYMENT_TARGET}")
|
||||
|
||||
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
||||
@@ -53,7 +59,8 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
set(RunCMake_TEST_OPTIONS
|
||||
"-DTEST_IOS=ON"
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install")
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
|
||||
"${IOS_DEPLOYMENT_TARGET}")
|
||||
|
||||
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
||||
@@ -117,7 +124,8 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
set(RunCMake_TEST_OPTIONS
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
|
||||
"-DCMAKE_IOS_INSTALL_COMBINED=YES")
|
||||
"-DCMAKE_IOS_INSTALL_COMBINED=YES"
|
||||
"${IOS_DEPLOYMENT_TARGET}")
|
||||
|
||||
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
||||
@@ -135,7 +143,8 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
set(RunCMake_TEST_OPTIONS
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
|
||||
"-DCMAKE_IOS_INSTALL_COMBINED=YES")
|
||||
"-DCMAKE_IOS_INSTALL_COMBINED=YES"
|
||||
"${IOS_DEPLOYMENT_TARGET}")
|
||||
|
||||
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
||||
@@ -153,7 +162,8 @@ if(NOT XCODE_VERSION VERSION_LESS 6)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
set(RunCMake_TEST_OPTIONS
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/_install"
|
||||
"-DCMAKE_IOS_INSTALL_COMBINED=YES")
|
||||
"-DCMAKE_IOS_INSTALL_COMBINED=YES"
|
||||
"${IOS_DEPLOYMENT_TARGET}")
|
||||
|
||||
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
||||
@@ -170,6 +180,7 @@ endif()
|
||||
if(NOT XCODE_VERSION VERSION_LESS 5)
|
||||
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeMultiplatform-build)
|
||||
set(RunCMake_TEST_NO_CLEAN 1)
|
||||
set(RunCMake_TEST_OPTIONS "${IOS_DEPLOYMENT_TARGET}")
|
||||
|
||||
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
|
||||
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
|
||||
|
||||
Reference in New Issue
Block a user