diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-03-12 16:19:16 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-03-12 16:19:16 +0000 |
| commit | a1a34e5477b35c39e3def209d16fa48a91fe8402 (patch) | |
| tree | 699c1c14cafd9bea6bdbf59d08087923309b2e6b /cmake | |
| parent | 656ef652cc9239af52f9ebe0d47151aeb56fddf1 (diff) | |
Doing some cleanup to the iOS toolchain.
* There is no reason to require SDKROOT as an environment variable because we can derive it from xcrun
* Setting CMAKE_RANLIB makes our static archives usable
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232053 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/platforms/iOS.cmake | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/cmake/platforms/iOS.cmake b/cmake/platforms/iOS.cmake index e18ca6bcc9..49140590ab 100644 --- a/cmake/platforms/iOS.cmake +++ b/cmake/platforms/iOS.cmake @@ -15,11 +15,10 @@ SET(CMAKE_C_COMPILER_WORKS True) SET(DARWIN_TARGET_OS_NAME ios) IF(NOT DEFINED ENV{SDKROOT}) - MESSAGE(FATAL_ERROR "SDKROOT env var must be set: " $ENV{SDKROOT}) -ENDIF() - -IF(EXISTS $ENV{SDKROOT}) - SET(SDKROOT $ENV{SDKROOT}) + execute_process(COMMAND xcodebuild -version -sdk iphoneos Path + OUTPUT_VARIABLE SDKROOT + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) ELSE() execute_process(COMMAND xcodebuild -version -sdk $ENV{SDKROOT} Path OUTPUT_VARIABLE SDKROOT @@ -27,8 +26,14 @@ ELSE() OUTPUT_STRIP_TRAILING_WHITESPACE) ENDIF() +IF(NOT EXISTS ${SDKROOT}) + MESSAGE(FATAL_ERROR "SDKROOT could not be detected!") +ENDIF() + +set(CMAKE_OSX_SYSROOT ${SDKROOT}) + IF(NOT CMAKE_C_COMPILER) - execute_process(COMMAND xcrun -sdk $ENV{SDKROOT} -find clang + execute_process(COMMAND xcrun -sdk ${SDKROOT} -find clang OUTPUT_VARIABLE CMAKE_C_COMPILER ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -36,7 +41,7 @@ IF(NOT CMAKE_C_COMPILER) ENDIF() IF(NOT CMAKE_CXX_COMPILER) - execute_process(COMMAND xcrun -sdk $ENV{SDKROOT} -find clang++ + execute_process(COMMAND xcrun -sdk ${SDKROOT} -find clang++ OUTPUT_VARIABLE CMAKE_CXX_COMPILER ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -44,7 +49,7 @@ IF(NOT CMAKE_CXX_COMPILER) ENDIF() IF(NOT CMAKE_AR) - execute_process(COMMAND xcrun -sdk $ENV{SDKROOT} -find ar + execute_process(COMMAND xcrun -sdk ${SDKROOT} -find ar OUTPUT_VARIABLE CMAKE_AR_val ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -52,8 +57,17 @@ IF(NOT CMAKE_AR) message(STATUS "Using ar ${CMAKE_AR}") ENDIF() +IF(NOT CMAKE_RANLIB) + execute_process(COMMAND xcrun -sdk ${SDKROOT} -find ranlib + OUTPUT_VARIABLE CMAKE_RANLIB_val + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + SET(CMAKE_RANLIB ${CMAKE_RANLIB_val} CACHE FILEPATH "Ranlib") + message(STATUS "Using ranlib ${CMAKE_RANLIB}") +ENDIF() + IF (NOT DEFINED IOS_MIN_TARGET) -execute_process(COMMAND xcodebuild -sdk $ENV{SDKROOT} -version SDKVersion +execute_process(COMMAND xcodebuild -sdk ${SDKROOT} -version SDKVersion OUTPUT_VARIABLE IOS_MIN_TARGET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) |