kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix bug in default arch, it was using the environment variable which is not a default

This commit is contained in:
Bill Hoffman 2007-11-08 14:31:56 -05:00
parent 43c8923f14
commit 2f23d79969
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Platform/Darwin.cmake
View File

@ -63,6 +63,9 @@ IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
IF("${_CMAKE_OSX_MACHINE}" MATCHES "Power") IF("${_CMAKE_OSX_MACHINE}" MATCHES "Power")
SET(_CMAKE_OSX_MACHINE ppc) SET(_CMAKE_OSX_MACHINE ppc)
ENDIF("${_CMAKE_OSX_MACHINE}" MATCHES "Power") ENDIF("${_CMAKE_OSX_MACHINE}" MATCHES "Power")
# set the default based on uname and not the environment variable
# as that is what is used to change it!
SET(CMAKE_OSX_ARCHITECTURES_DEFAULT ${_CMAKE_OSX_MACHINE})
# check for environment variable CMAKE_OSX_ARCHITECTURES # check for environment variable CMAKE_OSX_ARCHITECTURES
# if it is set. # if it is set.
IF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "") IF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
@ -71,7 +74,6 @@ IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
# now put _CMAKE_OSX_MACHINE into the cache # now put _CMAKE_OSX_MACHINE into the cache
SET(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE} SET(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE}
CACHE STRING "Build architectures for OSX") CACHE STRING "Build architectures for OSX")
SET(CMAKE_OSX_ARCHITECTURES_DEFAULT ${_CMAKE_OSX_MACHINE})
ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)