From: Yusuke Suzuki <utatane.tea@gmail.com>
Date: Mon, 2 Dec 2013 03:50:52 +0000 (+0900)
Subject: Fix CMakeLists.txt: do not override CMAKE_OSX_ARCHITECTURES
X-Git-Tag: gc7_6_0~310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ba9f6a9d296ce85c139d4fa3ba2c7a714346ed2;p=gc

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".
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5b93438..bd7b9270 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