sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OSX/cmake: move the new xcode-select-handing outside xcode conditional, to fix cmake/make compile

Browse Source
This commit is contained in:
Jens Verwiebe 2013-09-13 21:13:57 +00:00
parent eac7c19b04
commit 7a47803053
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -321,8 +321,6 @@ if(APPLE)
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)
@ -333,6 +331,8 @@ if(APPLE)
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
message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")