diff options
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 3 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index c6d6dda..348abfc 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -44,8 +44,7 @@ IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) # 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} - CACHE INTERNAL "uname -m architecture") + SET(CMAKE_OSX_ARCHITECTURES_DEFAULT ${_CMAKE_OSX_MACHINE}) ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 1e9c55a..5586ff5 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1945,7 +1945,7 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags, if(archs.size() == 1) { const char* archOrig = - this->Makefile->GetSafeDefinition("CMAKE_OSX_ARCHITECTURE_DEFAULT"); + this->Makefile->GetSafeDefinition("CMAKE_OSX_ARCHITECTURES_DEFAULT"); if(archs[0] == archOrig) { addArchFlag = false; |