[brlcad-commits] SF.net SVN: brlcad:[69164] brlcad/trunk/misc/CMake/RPath_Setup.cmake
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2016-10-24 01:30:48
|
Revision: 69164 http://sourceforge.net/p/brlcad/code/69164 Author: starseeker Date: 2016-10-24 01:30:45 +0000 (Mon, 24 Oct 2016) Log Message: ----------- OSX assigns rpaths individually, not as a common colon separated string. Modified Paths: -------------- brlcad/trunk/misc/CMake/RPath_Setup.cmake Modified: brlcad/trunk/misc/CMake/RPath_Setup.cmake =================================================================== --- brlcad/trunk/misc/CMake/RPath_Setup.cmake 2016-10-23 22:05:07 UTC (rev 69163) +++ brlcad/trunk/misc/CMake/RPath_Setup.cmake 2016-10-24 01:30:45 UTC (rev 69164) @@ -47,7 +47,7 @@ if(NOT APPLE) set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}:\$ORIGIN/../${LIB_DIR}") else(NOT APPLE) - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}:@loader_path/../${LIB_DIR}") + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR};@loader_path/../${LIB_DIR}") endif(NOT APPLE) # On OSX, we need to set INSTALL_NAME_DIR instead of RPATH for CMake < 3.0 # http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |