Revision: 77740
http://sourceforge.net/p/brlcad/code/77740
Author: starseeker
Date: 2020-11-17 22:50:25 +0000 (Tue, 17 Nov 2020)
Log Message:
-----------
rpath contents are different on OSX...
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/RPath_Setup.cmake
brlcad/branches/extbuild/src/other/ext/CMake/RPath_Setup.cmake
Modified: brlcad/branches/extbuild/misc/CMake/RPath_Setup.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/RPath_Setup.cmake 2020-11-17
04:41:42 UTC (rev 77739)
+++ brlcad/branches/extbuild/misc/CMake/RPath_Setup.cmake 2020-11-17
22:50:25 UTC (rev 77740)
@@ -60,7 +60,11 @@
if (R_LEN)
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
while("${CURR_LEN}" LESS "${R_LEN}")
- set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
+ if (APPLE)
+ set(RELATIVE_RPATH "${RELATIVE_RPATH};")
+ else (APPLE)
+ set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
+ endif (APPLE)
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
endwhile("${CURR_LEN}" LESS "${R_LEN}")
endif (R_LEN)
@@ -209,7 +213,11 @@
# outputs of our own build.
string(LENGTH "${BUILD_RPATH}" CURR_LEN)
while("${CURR_LEN}" LESS "${LLEN}")
- set(BUILD_RPATH "${BUILD_RPATH}:")
+ if (APPLE)
+ set(BUILD_RPATH "${BUILD_RPATH};")
+ else (APPLE)
+ set(BUILD_RPATH "${BUILD_RPATH}:")
+ endif (APPLE)
string(LENGTH "${BUILD_RPATH}" CURR_LEN)
endwhile("${CURR_LEN}" LESS "${LLEN}")
Modified: brlcad/branches/extbuild/src/other/ext/CMake/RPath_Setup.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/RPath_Setup.cmake
2020-11-17 04:41:42 UTC (rev 77739)
+++ brlcad/branches/extbuild/src/other/ext/CMake/RPath_Setup.cmake
2020-11-17 22:50:25 UTC (rev 77740)
@@ -60,7 +60,11 @@
if (R_LEN)
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
while("${CURR_LEN}" LESS "${R_LEN}")
- set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
+ if (APPLE)
+ set(RELATIVE_RPATH "${RELATIVE_RPATH};")
+ else (APPLE)
+ set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
+ endif (APPLE)
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
endwhile("${CURR_LEN}" LESS "${R_LEN}")
endif (R_LEN)
@@ -81,6 +85,7 @@
# Done - let the parent know what the answers are
set(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH}" PARENT_SCOPE)
+
endfunction(std_build_rpath)
#---------------------------------------------------------------------
@@ -204,7 +209,11 @@
# outputs of our own build.
string(LENGTH "${BUILD_RPATH}" CURR_LEN)
while("${CURR_LEN}" LESS "${LLEN}")
- set(BUILD_RPATH "${BUILD_RPATH}:")
+ if (APPLE)
+ set(BUILD_RPATH "${BUILD_RPATH};")
+ else (APPLE)
+ set(BUILD_RPATH "${BUILD_RPATH}:")
+ endif (APPLE)
string(LENGTH "${BUILD_RPATH}" CURR_LEN)
endwhile("${CURR_LEN}" LESS "${LLEN}")
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
