diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-14 01:13:57 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-14 01:13:57 +0400 |
| commit | 7a4780305331153f7a5251ec2d7108fc693e1ace (patch) | |
| tree | 96fc57529f7b6955343175df3c899f9436fbe49e /CMakeLists.txt | |
| parent | eac7c19b046c53bc41dd523f97c786bb13e373ea (diff) | |
OSX/cmake: move the new xcode-select-handing outside xcode conditional, to fix cmake/make compile
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2df66055015..6fd21a48f37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -320,18 +320,18 @@ if(APPLE) set(OSX_SYSTEM unsupported) endif() message(STATUS "Detected system-version: " ${OSX_SYSTEM}) - - if(${CMAKE_GENERATOR} MATCHES "Xcode") - # workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout - # but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number> - execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case - message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE}) - string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension - if(${DP_NAME} MATCHES Xcode5) - set(XCODE_VERSION 5) - endif() + # workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout + # but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number> + execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case + message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE}) + string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension + if(${DP_NAME} MATCHES Xcode5) + set(XCODE_VERSION 5) + endif() + + if(${CMAKE_GENERATOR} MATCHES "Xcode") ##### cmake incompatibility with xcode 4.3 and higher ##### if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var |