diff options
| author | Ruslan Baratov <ruslan_baratov@yahoo.com> | 2019-03-01 18:08:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-05 14:42:41 (GMT) |
| commit | e427c7c1d8077cad009f84eca9186efc584ac297 (patch) | |
| tree | 90f0edc70623f89a6667815f35c17e1266d37c05 | |
| parent | 20a41aa589d4418f9ac46fc8c0402162d1d82873 (diff) | |
| download | CMake-e427c7c1d8077cad009f84eca9186efc584ac297.zip CMake-e427c7c1d8077cad009f84eca9186efc584ac297.tar.gz CMake-e427c7c1d8077cad009f84eca9186efc584ac297.tar.bz2 | |
iOS: Add IOS variable
Since commit 11da882a12 (Apple: Introduce separate system name for iOS,
tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) we support setting
`CMAKE_SYSTEM_NAME` to `iOS`. Existing iOS toolchain files already
set `IOS` as a short-hand variable, so do the same here.
| -rw-r--r-- | Help/manual/cmake-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/variable/IOS.rst | 4 | ||||
| -rw-r--r-- | Modules/Platform/iOS-Initialize.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake | 4 |
4 files changed, 11 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 83c88a5..7609597 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -259,6 +259,7 @@ Variables that Describe the System /variable/CMAKE_SYSTEM_VERSION /variable/CYGWIN /variable/GHS-MULTI + /variable/IOS /variable/MINGW /variable/MSVC /variable/MSVC10 diff --git a/Help/variable/IOS.rst b/Help/variable/IOS.rst new file mode 100644 index 0000000..e5cc3f6 --- /dev/null +++ b/Help/variable/IOS.rst @@ -0,0 +1,4 @@ +IOS +--- + +Set to ``1`` when the target system (:variable:`CMAKE_SYSTEM_NAME`) is ``iOS``. diff --git a/Modules/Platform/iOS-Initialize.cmake b/Modules/Platform/iOS-Initialize.cmake index 41399a3..301ca4c 100644 --- a/Modules/Platform/iOS-Initialize.cmake +++ b/Modules/Platform/iOS-Initialize.cmake @@ -4,4 +4,6 @@ if(NOT _CMAKE_OSX_SYSROOT_PATH MATCHES "/iPhone(OS|Simulator)") message(FATAL_ERROR "${CMAKE_OSX_SYSROOT} is not an iOS SDK") endif() +set(IOS 1) + set(_CMAKE_FEATURE_DETECTION_TARGET_TYPE STATIC_LIBRARY) diff --git a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake index 7f31d94..f6c00b1 100644 --- a/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake +++ b/Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake @@ -6,6 +6,10 @@ if(XCODE_VERSION VERSION_GREATER_EQUAL 9) set(CMAKE_OSX_DEPLOYMENT_TARGET 10) endif() +if(NOT IOS) + message(FATAL_ERROR "IOS variable is not set") +endif() + set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO") |