Revision: 77758
http://sourceforge.net/p/brlcad/code/77758
Author: starseeker
Date: 2020-11-20 17:45:12 +0000 (Fri, 20 Nov 2020)
Log Message:
-----------
Looks like the combination of delte_rpath and add_rpath worked
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
Modified:
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-11-20 15:34:53 UTC (rev 77757)
+++ brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-11-20 17:45:12 UTC (rev 77758)
@@ -272,6 +272,7 @@
# Note - proper quoting for install(CODE) is extremely important for CPack,
see
# https://stackoverflow.com/a/48487133
if (APPLE)
+ # install_name_tool works more reliably than file(RPATH_CHANGE) on the
Mac...
install(CODE "
message(\"OLD_RPATH: ${CMAKE_BUILD_RPATH}\")
message(\"NEW_RPATH: ${NEW_RPATH}\")
@@ -281,10 +282,14 @@
execute_process(COMMAND ls -l \${CMAKE_INSTALL_PREFIX}/${OFILE})
execute_process(COMMAND otool -l \"\${WPATH}\" OUTPUT_VARIABLE OTOOL_OUT)
message(\"OTOOL_OUT: \${OTOOL_OUT}\")
- message(\"install_name_tool -change ${CMAKE_BUILD_RPATH} ${NEW_RPATH}
\${WPATH}\")
- execute_process(COMMAND install_name_tool -change \"${CMAKE_BUILD_RPATH}\"
\"${NEW_RPATH}\" \"\${WPATH}\")
+ message(\"install_name_tool -delete_rpath ${CMAKE_BUILD_RPATH} \${WPATH}\")
+ execute_process(COMMAND install_name_tool -delete_rpath
\"${CMAKE_BUILD_RPATH}\" \"\${WPATH}\")
execute_process(COMMAND otool -l \"\${WPATH}\" OUTPUT_VARIABLE OTOOL_OUT2)
message(\"OTOOL_OUT2: \${OTOOL_OUT2}\")
+ message(\"install_name_tool -add_rpath ${NEW_RPATH} \${WPATH}\")
+ execute_process(COMMAND install_name_tool -add_rpath \"${NEW_RPATH}\"
\"\${WPATH}\")
+ execute_process(COMMAND otool -l \"\${WPATH}\" OUTPUT_VARIABLE OTOOL_OUT3)
+ message(\"OTOOL_OUT3: \${OTOOL_OUT3}\")
")
else (APPLE)
install(CODE "
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
