Author: dcreager
Date: Sat Oct 15 14:22:30 2011
New Revision: 1183648
URL: http://svn.apache.org/viewvc?rev=1183648&view=rev
Log:
AVRO-929. C: Set install_name in shared library on Mac OS X
CMake will automatically call the install_name_tool program for us if we
set the CMAKE_INSTALL_NAME_DIR variable. We now automatically set this
variable if we're running on Mac OS X, and it's not set already. Its
default value is "${CMAKE_INSTALL_PREFIX}/lib".
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=1183648&r1=1183647&r2=1183648&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Sat Oct 15 14:22:30 2011
@@ -35,6 +35,9 @@ Avro 1.6.0 (unreleased)
AVRO-922. C: Comparison function for new value interface. (dcreager)
+ AVRO-929. C: Set install_name in shared library on Mac OS OX.
+ (dcreager)
+
AVRO-474. C: Added source package target to CMake build scripts.
(dcreager)
Modified: avro/trunk/lang/c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/CMakeLists.txt?rev=1183648&r1=1183647&r2=1183648&view=diff
==============================================================================
--- avro/trunk/lang/c/CMakeLists.txt (original)
+++ avro/trunk/lang/c/CMakeLists.txt Sat Oct 15 14:22:30 2011
@@ -75,6 +75,9 @@ 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)
endif(APPLE)
if(CMAKE_COMPILER_IS_GNUCC)
