diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-17 15:53:02 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-17 15:53:02 (GMT) |
| commit | ea282284d5d626b1143bea8d3be70995eaa88f2e (patch) | |
| tree | 8ac5f12977743e8caa4d2850fa5bff9d0ca3fe79 /Modules/Platform | |
| parent | 8e8c9b72428ab3f4a63a99820dfd4aab46661bd6 (diff) | |
| download | CMake-ea282284d5d626b1143bea8d3be70995eaa88f2e.zip CMake-ea282284d5d626b1143bea8d3be70995eaa88f2e.tar.gz CMake-ea282284d5d626b1143bea8d3be70995eaa88f2e.tar.bz2 | |
Fix for bug #9466. Change the implementation of OSX arch lists. If no ARCHs are specified by the user then no flags are set. We no longer use CMAKE_OSX_ARCHITECTURES_DEFAULT.
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index b0179f4..825f218 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -149,16 +149,12 @@ IF(_CMAKE_OSX_MACHINE MATCHES "Power") SET(_CMAKE_OSX_MACHINE ppc) 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 # if it is set. IF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "") SET(CMAKE_OSX_ARCHITECTURES_VALUE "$ENV{CMAKE_OSX_ARCHITECTURES}") ELSE(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "") - SET(CMAKE_OSX_ARCHITECTURES_VALUE ${CMAKE_OSX_ARCHITECTURES_DEFAULT}) + SET(CMAKE_OSX_ARCHITECTURES_VALUE "") ENDIF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "") # now put _CMAKE_OSX_MACHINE into the cache |