[Cmake-commits] [cmake-commits] hoffman committed Darwin.cmake 1.58 1.59

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv18430/Modules/Platform

Modified Files:
	Darwin.cmake 
Log Message:
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.


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.58
retrieving revision 1.59
diff -C 2 -d -r1.58 -r1.59
*** Darwin.cmake	24 Feb 2009 20:37:08 -0000	1.58
--- Darwin.cmake	17 Sep 2009 15:52:59 -0000	1.59
***************
*** 150,157 ****
  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.
--- 150,153 ----
***************
*** 159,163 ****
    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})
  ENDIF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
  
--- 155,159 ----
    SET(CMAKE_OSX_ARCHITECTURES_VALUE "$ENV{CMAKE_OSX_ARCHITECTURES}")
  ELSE(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
!   SET(CMAKE_OSX_ARCHITECTURES_VALUE "")
  ENDIF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")