svn commit: r1175560 - in /avro/trunk: CHANGES.txt lang/c/CMakeLists.txt

[dc...@apache.org]

Author: dcreager
Date: Sun Sep 25 19:57:53 2011
New Revision: 1175560

URL: http://svn.apache.org/viewvc?rev=1175560&view=rev
Log:
AVRO-894. C: cmake build now works on Mac OS X Lion

Before we were mistakenly setting CMAKE_OSX_ARCHITECTURES to our default
value, even if the user provided an override.  And our default included
"ppc", which borked on Lion since it doesn't include PowerPC compilers
in the Developer Tools.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/c/CMakeLists.txt

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1175560&r1=1175559&r2=1175560&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Sun Sep 25 19:57:53 2011
@@ -94,6 +94,8 @@ Avro 1.5.4 (12 September 2011)
     AVRO-892. Python: Fix an "integer out of range" error with snappy
     compression.  (Michael Cooper via cutting)
 
+    AVRO-894. C: cmake build now works on Mac OS X Lion. (dcreager)
+
 Avro 1.5.3 (25 August 2011)
 
   IMPROVEMENTS

Modified: avro/trunk/lang/c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/CMakeLists.txt?rev=1175560&r1=1175559&r2=1175560&view=diff
==============================================================================
--- avro/trunk/lang/c/CMakeLists.txt (original)
+++ avro/trunk/lang/c/CMakeLists.txt Sun Sep 25 19:57:53 2011
@@ -43,7 +43,9 @@ endif(LIBAVRO_VERSION_RESULT)
 
 
 if(APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "ppc;i386;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE) 
+    if (NOT CMAKE_OSX_ARCHITECTURES)
+        set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE)
+    endif (NOT CMAKE_OSX_ARCHITECTURES)
 endif(APPLE)
 
 if(CMAKE_COMPILER_IS_GNUCC)