diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-15 14:56:36 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-15 14:56:36 +0400 |
| commit | 0c4e665c052cbd62955d5958b4acca4b741efa7a (patch) | |
| tree | f4b1bec5c9d678459b8e47cb894b33a62bb6e1a5 /CMakeLists.txt | |
| parent | 891dfa12f3be44993e3cb2ebde88f89f84c60dbe (diff) | |
OSX/cmake: fix config by moving code back into xcode conditional, cmake/makefiles does not even have xcode_vesion lookup
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d30d29cf27..14209d2c8ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -326,14 +326,15 @@ if(APPLE) 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}) - if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from - 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() - endif() if(${CMAKE_GENERATOR} MATCHES "Xcode") + + if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from + 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() + endif() ##### 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 |