Revision: 77345
http://sourceforge.net/p/brlcad/code/77345
Author: starseeker
Date: 2020-10-06 17:24:56 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
Correct path being set after .
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-06 16:45:52 UTC (rev 77344)
+++ brlcad/branches/thirdparty_rework/misc/CMake/RPath_Setup.cmake
2020-10-06 17:24:56 UTC (rev 77345)
@@ -48,7 +48,7 @@
# For a given path, calculate the $ORIGIN style path needed relative
# to CMAKE_INSTALL_PREFIX
-function(SUFFIX_STRING POPATH INIT_PATH)
+function(ORIGIN_REL_PATH POPATH INIT_PATH)
get_filename_component(CPATH "${INIT_PATH}" REALPATH)
set(RELDIRS)
@@ -68,7 +68,7 @@
set(FPATH "${FPATH}${RELDIRS}")
set(${POPATH} ${FPATH} PARENT_SCOPE)
-endfunction(SUFFIX_STRING)
+endfunction()
if(NOT COMMAND cmake_set_rpath)
@@ -100,7 +100,7 @@
# Calculate how many ../ offsets are needed to return from this directory
# to the install origin
set(OPATH)
- SUFFIX_STRING(OPATH "${CMAKE_INSTALL_PREFIX}/${LSUFFIX}")
+ ORIGIN_REL_PATH(OPATH "${CMAKE_INSTALL_PREFIX}/${LSUFFIX}")
# Set RPATH value to use when installing. This should be set to always
# prefer the version in the installed path when possible, but fall back on
a
@@ -107,9 +107,9 @@
# location relative to the loading file's path if the installed version is
# not present. How to do so is platform specific.
if(NOT APPLE)
- set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LSUFFIX}:\$ORIGIN/${OPATH}/${LSUFFIX}")
+ set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LSUFFIX}:\$ORIGIN/${OPATH}")
else(NOT APPLE)
- set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LSUFFIX};@loader_path/${OPATH}/${LSUFFIX}")
+ set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LSUFFIX};@loader_path/${OPATH}")
endif(NOT APPLE)
# Determine what the build time RPATH will be that is used to support
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
