Revision: 77342
http://sourceforge.net/p/brlcad/code/77342
Author: starseeker
Date: 2020-10-06 13:53:51 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
Ah - need to pass the CMAKE_BUILD_RPATH from the main build to the
src/superbuild subconfigure
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-06 13:31:07 UTC
(rev 77341)
+++ brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-06 13:53:51 UTC
(rev 77342)
@@ -234,7 +234,7 @@
# Now we prepare and invoke the superbuild as a separate process
execute_process(
- COMMAND ${CMAKE_COMMAND} -S ${CMAKE_SOURCE_DIR}/src/superbuild
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -S ${CMAKE_SOURCE_DIR}/src/superbuild
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_BUILD_RPATH=${CMAKE_BUILD_RPATH}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/superbuild"
)
execute_process(
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-06 13:31:07 UTC (rev 77341)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-06 13:53:51 UTC (rev 77342)
@@ -45,8 +45,6 @@
set(CMAKE_SYSTEM_IGNORE_PATH "${CMAKE_INSTALL_PREFIX}")
include(Path_Setup)
-include(RPath_Setup)
-cmake_set_rpath()
# If targets are built, we want to group them in build tools that support
# doing so.
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
