[cmake-commits] hoffman committed Darwin.cmake 1.39 1.40

[cmake-commits at cmake.org]

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

Modified Files:
	Darwin.cmake 
Log Message:
ENH: fix bug in default arch, it was using the environment variable which is not a default


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Darwin.cmake	8 Nov 2007 14:09:14 -0000	1.39
+++ Darwin.cmake	8 Nov 2007 19:31:56 -0000	1.40
@@ -63,6 +63,9 @@
   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 "")
@@ -71,7 +74,6 @@
   # now put _CMAKE_OSX_MACHINE into the cache
   SET(CMAKE_OSX_ARCHITECTURES ${_CMAKE_OSX_MACHINE}
     CACHE STRING "Build architectures for OSX")
-  SET(CMAKE_OSX_ARCHITECTURES_DEFAULT ${_CMAKE_OSX_MACHINE})
 ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)