Author: brane
Date: Thu Sep 27 15:02:37 2018
New Revision: 1842100
URL: http://svn.apache.org/viewvc?rev=1842100&view=rev
Log:
Make the CMake build set the absolute RPATH in the shared library on macOS.
* CMakeLists.txt (target serf_shared): Set the INSTALL_NAME_DIR property.
* build/SerfPlatform.cmake: Set CMAKE_MACOSX_RPATH to FALSE on OSX.
Modified:
serf/trunk/CMakeLists.txt
serf/trunk/build/SerfPlatform.cmake
Modified: serf/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1842100&r1=1842099&r2=1842100&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Thu Sep 27 15:02:37 2018
@@ -302,7 +302,8 @@ if(NOT SKIP_SHARED)
set_target_properties(serf_shared
PROPERTIES
VERSION ${SERF_VERSION}
- SOVERSION ${SERF_SOVERSION})
+ SOVERSION ${SERF_SOVERSION}
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
set(SERF_TARGETS "serf_shared")
if(SERF_WINDOWS)
Modified: serf/trunk/build/SerfPlatform.cmake
URL:
http://svn.apache.org/viewvc/serf/trunk/build/SerfPlatform.cmake?rev=1842100&r1=1842099&r2=1842100&view=diff
==============================================================================
--- serf/trunk/build/SerfPlatform.cmake (original)
+++ serf/trunk/build/SerfPlatform.cmake Thu Sep 27 15:02:37 2018
@@ -19,6 +19,7 @@
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(SERF_DARWIN TRUE)
+ set(CMAKE_MACOSX_RPATH FALSE)
message(STATUS "Target platform is Darwin (macOS)")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(SERF_LINUX TRUE)
