Skip to content

Commit

Permalink
Fix CMakeLists.txt: do not override CMAKE_OSX_ARCHITECTURES
Browse files Browse the repository at this point in the history
* CMakeLists.txt: Since latest OSX compiler (clang) provided by Xcode is
not accept "-arch ppc"; So if CMAKE_OSX_ARCHITECTURES is defined by
client, CMakeLists.txt should not force "ppc;i386;x86_64".
  • Loading branch information
Constellation authored and ivmai committed Dec 8, 2013
1 parent 6f0c240 commit 7ba9f6a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Expand Up @@ -31,7 +31,9 @@ ADD_DEFINITIONS("-D_CRT_SECURE_NO_DEPRECATE
-DALL_INTERIOR_POINTERS")

IF(APPLE)
SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE)
IF("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE)
ENDIF()
ENDIF(APPLE)

#LIBATOMIC #TODO
Expand Down

0 comments on commit 7ba9f6a

Please sign in to comment.