Revision: 77755
http://sourceforge.net/p/brlcad/code/77755
Author: starseeker
Date: 2020-11-20 02:26:34 +0000 (Fri, 20 Nov 2020)
Log Message:
-----------
Looking better, but still can't get file(RPATH_CHANGE) to succeed with 3rd
party outputs on mac...
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/RPath_Setup.cmake
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.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-20
01:24:20 UTC (rev 77754)
+++ brlcad/branches/extbuild/misc/CMake/RPath_Setup.cmake 2020-11-20
02:26:34 UTC (rev 77755)
@@ -57,17 +57,13 @@
# IFF the caller tells us to, lengthen the relative path to a
# specified length. This is useful in scenarios where the relative
# path is the only viable option
- if (R_LEN)
+ if (R_LEN AND NOT APPLE)
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
while("${CURR_LEN}" LESS "${R_LEN}")
- if (APPLE)
- set(RELATIVE_RPATH "${RELATIVE_RPATH};")
- else (APPLE)
- set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
- endif (APPLE)
+ set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
endwhile("${CURR_LEN}" LESS "${R_LEN}")
- endif (R_LEN)
+ endif ()
set(${outvar} "${RELATIVE_RPATH}" PARENT_SCOPE)
@@ -212,14 +208,12 @@
# external build systems so their outputs can be manipulated as if they were
# outputs of our own build.
string(LENGTH "${BUILD_RPATH}" CURR_LEN)
- while("${CURR_LEN}" LESS "${LLEN}")
- if (APPLE)
- set(BUILD_RPATH "${BUILD_RPATH};")
- else (APPLE)
+ if (NOT APPLE)
+ while("${CURR_LEN}" LESS "${LLEN}")
set(BUILD_RPATH "${BUILD_RPATH}:")
- endif (APPLE)
- string(LENGTH "${BUILD_RPATH}" CURR_LEN)
- endwhile("${CURR_LEN}" LESS "${LLEN}")
+ string(LENGTH "${BUILD_RPATH}" CURR_LEN)
+ endwhile("${CURR_LEN}" LESS "${LLEN}")
+ endif (NOT APPLE)
# Done - let the parent know what the answers are
set(CMAKE_BUILD_RPATH "${BUILD_RPATH}" PARENT_SCOPE)
Modified:
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-11-20 01:24:20 UTC (rev 77754)
+++ brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-11-20 02:26:34 UTC (rev 77755)
@@ -263,7 +263,7 @@
if (NOT APPLE)
set(NEW_RPATH "$ENV{DESTDIR}${RRPATH}:$ORIGIN/${OPATH}")
else (NOT APPLE)
- set(NEW_RPATH "$ENV{DESTDIR}${RRPATH}:@loader_path/${OPATH}")
+ set(NEW_RPATH "$ENV{DESTDIR}${RRPATH};@loader_path/${OPATH}")
endif (NOT APPLE)
if (NOT DEFINED CMAKE_BUILD_RPATH)
message(FATAL_ERROR "ET_RPath run without CMAKE_BUILD_RPATH defined - run
cmake_set_rpath before defining external projects.")
Modified: brlcad/branches/extbuild/src/other/ext/CMake/RPath_Setup.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/RPath_Setup.cmake
2020-11-20 01:24:20 UTC (rev 77754)
+++ brlcad/branches/extbuild/src/other/ext/CMake/RPath_Setup.cmake
2020-11-20 02:26:34 UTC (rev 77755)
@@ -57,17 +57,13 @@
# IFF the caller tells us to, lengthen the relative path to a
# specified length. This is useful in scenarios where the relative
# path is the only viable option
- if (R_LEN)
+ if (R_LEN AND NOT APPLE)
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
while("${CURR_LEN}" LESS "${R_LEN}")
- if (APPLE)
- set(RELATIVE_RPATH "${RELATIVE_RPATH};")
- else (APPLE)
- set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
- endif (APPLE)
+ set(RELATIVE_RPATH "${RELATIVE_RPATH}:")
string(LENGTH "${RELATIVE_RPATH}" CURR_LEN)
endwhile("${CURR_LEN}" LESS "${R_LEN}")
- endif (R_LEN)
+ endif ()
set(${outvar} "${RELATIVE_RPATH}" PARENT_SCOPE)
@@ -208,14 +204,12 @@
# external build systems so their outputs can be manipulated as if they were
# outputs of our own build.
string(LENGTH "${BUILD_RPATH}" CURR_LEN)
- while("${CURR_LEN}" LESS "${LLEN}")
- if (APPLE)
- set(BUILD_RPATH "${BUILD_RPATH};")
- else (APPLE)
+ if (NOT APPLE)
+ while("${CURR_LEN}" LESS "${LLEN}")
set(BUILD_RPATH "${BUILD_RPATH}:")
- endif (APPLE)
- string(LENGTH "${BUILD_RPATH}" CURR_LEN)
- endwhile("${CURR_LEN}" LESS "${LLEN}")
+ string(LENGTH "${BUILD_RPATH}" CURR_LEN)
+ endwhile("${CURR_LEN}" LESS "${LLEN}")
+ endif (NOT APPLE)
# Done - let the parent know what the answers are
set(CMAKE_BUILD_RPATH "${BUILD_RPATH}" PARENT_SCOPE)
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
