Revision: 77464
http://sourceforge.net/p/brlcad/code/77464
Author: starseeker
Date: 2020-10-16 20:45:58 +0000 (Fri, 16 Oct 2020)
Log Message:
-----------
Fix RPATH setting for parent BRL-CAD build outputs.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/misc/CMake/RPath_Setup.cmake
Modified: brlcad/branches/thirdparty_rework/misc/CMake/RPath_Setup.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/RPath_Setup.cmake
2020-10-16 20:45:33 UTC (rev 77463)
+++ brlcad/branches/thirdparty_rework/misc/CMake/RPath_Setup.cmake
2020-10-16 20:45:58 UTC (rev 77464)
@@ -81,6 +81,11 @@
# Done - let the parent know what the answers are
set(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH}" PARENT_SCOPE)
+
+ # Set the final install rpath
+ relative_rpath(RELPATH)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}${RELPATH}"
PARENT_SCOPE)
+
endfunction(std_build_rpath)
#---------------------------------------------------------------------
@@ -211,6 +216,10 @@
# Done - let the parent know what the answers are
set(CMAKE_BUILD_RPATH "${BUILD_RPATH}" PARENT_SCOPE)
+ # Set the final install rpath
+ relative_rpath(RELPATH)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}${RELPATH}"
PARENT_SCOPE)
+
endfunction(ext_build_rpath)
# Local Variables:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
