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

[dc...@apache.org]

Author: dcreager
Date: Sun May 20 13:51:19 2012
New Revision: 1340720

URL: http://svn.apache.org/viewvc?rev=1340720&view=rev
Log:
AVRO-1096. C: Don't set default CMAKE_OSX_ARCHITECTURES

Our CMake build scripts set CMAKE_OSX_ARCHITECTURES to a default value,
and don't let the user override this value.  It should really be left up
to the user to choose whether to build a universal binary or not.
(Especially since the list of supported platforms differs depending on
which OS X version you're running.)

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=1340720&r1=1340719&r2=1340720&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Sun May 20 13:51:19 2012
@@ -88,6 +88,8 @@ Avro 1.7.0 (unreleased)
     AVRO-1082. C: Avoid leaking open FILE objects.
     (Pugachev Maxim via dcreager)
 
+    AVRO-1096. C: Don't set default CMAKE_OSX_ARCHITECTURES. (dcreager)
+
 Avro 1.6.3 (5 March 2012)
 
     AVRO-1077. Missing 'inline' for union set function. (thiru)

Modified: avro/trunk/lang/c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/CMakeLists.txt?rev=1340720&r1=1340719&r2=1340720&view=diff
==============================================================================
--- avro/trunk/lang/c/CMakeLists.txt (original)
+++ avro/trunk/lang/c/CMakeLists.txt Sun May 20 13:51:19 2012
@@ -86,9 +86,6 @@ include(CheckLibraryExists)
 
 
 if(APPLE)
-    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)
     if (NOT CMAKE_INSTALL_NAME_DIR)
         set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
     endif (NOT CMAKE_INSTALL_NAME_DIR)