Browse Source

Merge branch 'ios-variable' into release-3.14

Merge-request: !3051
Brad King 6 years ago
parent
commit
509a9409c3

+ 1 - 0
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

+ 4 - 0
Help/variable/IOS.rst

@@ -0,0 +1,4 @@
+IOS
+---
+
+Set to ``1`` when the target system (:variable:`CMAKE_SYSTEM_NAME`) is ``iOS``.

+ 2 - 0
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)

+ 4 - 0
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")