From 7ba9f6a9d296ce85c139d4fa3ba2c7a714346ed2 Mon Sep 17 00:00:00 2001 From: Yusuke Suzuki Date: Mon, 2 Dec 2013 12:50:52 +0900 Subject: [PATCH] Fix CMakeLists.txt: do not override CMAKE_OSX_ARCHITECTURES * 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". --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5b9343..bd7b927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 -- 2.7.4