From ea282284d5d626b1143bea8d3be70995eaa88f2e Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 17 Sep 2009 11:53:02 -0400 Subject: 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. --- Modules/Platform/Darwin.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Modules/Platform/Darwin.cmake') diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index b0179f4324..825f218615 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 -- cgit v1.2.1