working dev and install rpath on OSX

PDAL · Jan 19, 2015 · c2175dc · c2175dc
1 parent 407b7c2
commit c2175dc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,7 +49,7 @@ file(MAKE_DIRECTORY "${PDAL_OUTPUT_LIB_DIR}")
 file(MAKE_DIRECTORY "${PDAL_OUTPUT_BIN_DIR}")
 # per http://www.cmake.org/Wiki/CMake_RPATH_handling
 SET(CMAKE_SKIP_BUILD_RPATH FALSE )
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 #SET(CMAKE_SKIP_RPATH ON)
 IF (APPLE)

diff --git a/cmake/macros.cmake b/cmake/macros.cmake
@@ -64,7 +64,7 @@ macro(PDAL_ADD_LIBRARY _name)
         LIBRARY DESTINATION ${PDAL_LIB_INSTALL_DIR}
         ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR})
     if (APPLE)
-        set_target_properties(${_name} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_RPATH}/;${PDAL_DRIVER_INSTALL_PATH}/")
+        set_target_properties(${_name} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
     endif()
 endmacro(PDAL_ADD_LIBRARY)
 
@@ -115,10 +115,7 @@ macro(PDAL_ADD_PLUGIN _name _type _shortname)
         LIBRARY DESTINATION ${PDAL_PLUGIN_INSTALL_DIR}
         ARCHIVE DESTINATION ${PDAL_PLUGIN_INSTALL_DIR})
     if (APPLE)
-        #set_target_properties(${${_name}} PROPERTIES INSTALL_RPATH "@loader_path/${PDAL_PLUGIN_INSTALL_DIR}")
-        #        set_target_properties(${${_name}} PROPERTIES INSTALL_RPATH "@loader_path/../${PDAL_PLUGIN_INSTALL_DIR}/")
-        set_target_properties(${${_name}} PROPERTIES INSTALL_NAME_DIR "@executable_path/../${PDAL_PLUGIN_INSTALL_DIR}")
-        #        set_target_properties(${${_name}} PROPERTIES INSTALL_RPATH "@rpath/")
+        set_target_properties(${${_name}} PROPERTIES INSTALL_NAME_DIR "@loader_path/")
     endif()
 
 endmacro(PDAL_ADD_PLUGIN)

diff --git a/src/StageFactory.cpp b/src/StageFactory.cpp
@@ -359,8 +359,7 @@ void StageFactory::loadPlugins()
     if (pluginDir.size() == 0)
     {
         std::ostringstream oss;
-//         oss << PDAL_DRIVER_INSTALL_PATH << ":/usr/local/lib:./lib:../lib:../bin";
-        oss << PDAL_DRIVER_INSTALL_PATH ;
+         oss << PDAL_DRIVER_INSTALL_PATH << ":/usr/local/lib:./lib:../lib:../bin";
         pluginDir = oss.str();
     }