Revision: 77463
http://sourceforge.net/p/brlcad/code/77463
Author: starseeker
Date: 2020-10-16 20:45:33 +0000 (Fri, 16 Oct 2020)
Log Message:
-----------
Fix install RPATH setting for 3rd party builds
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-16 20:24:59 UTC (rev 77462)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-16 20:45:33 UTC (rev 77463)
@@ -241,7 +241,7 @@
# https://stackoverflow.com/a/48487133
install(CODE "
file(RPATH_CHANGE
- FILE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OFINAL}\"
+ FILE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OFILE}\"
OLD_RPATH \"${CMAKE_BUILD_RPATH}\"
NEW_RPATH \"${NEW_RPATH}\")
")
@@ -342,7 +342,7 @@
# Perform RPath magic
if (E_RPATH)
- ET_RPath("${CMAKE_INSTALL_PREFIX}/${SHARED_DIR}/${fname}")
+ ET_RPath("${SHARED_DIR}/${fname}")
endif (E_RPATH)
# Add install rules for any symlinks the caller has listed
@@ -400,7 +400,7 @@
# Perform RPath magic
if (E_RPATH)
- ET_RPath("${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${fname}")
+ ET_RPath("${BIN_DIR}/${fname}")
endif (E_RPATH)
endif (NOT MSVC)
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
