Revision: 77665
http://sourceforge.net/p/brlcad/code/77665
Author: starseeker
Date: 2020-11-02 20:11:40 +0000 (Mon, 02 Nov 2020)
Log Message:
-----------
fix relpath path for itcl subdir.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/itcl.cmake
Modified: brlcad/branches/extbuild/src/other/ext/itcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-02 15:06:50 UTC
(rev 77664)
+++ brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-02 20:11:40 UTC
(rev 77665)
@@ -58,6 +58,12 @@
if (BUILD_ITCL)
+ # If we're building ITCL, it's path setup must take into account the
+ # subdirectory in which we are storing the library.
+ relative_rpath(RELPATH SUFFIX itcl3.4)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}${RELPATH}")
+ ext_build_rpath(SUFFIX itcl3.4)
+
set(BRLCAD_ITCL_BUILD "ON" CACHE STRING "Enable Itcl build" FORCE)
set(ITCL_SRC_DIR
"${CMAKE_CURRENT_BINARY_DIR}/ITCL_BLD-prefix/src/ITCL_BLD")
@@ -74,7 +80,7 @@
list(APPEND ITCL_DEPS tclsh_exe_stage)
endif (TARGET tcl_stage)
- set(ITCL_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/itcl3)
+ set(ITCL_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/itcl3.4)
ExternalProject_Add(ITCL_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/itcl3"
@@ -135,6 +141,11 @@
SetTargetFolder(ITCL_BLD "Third Party Libraries")
+ # Restore default rpath settings
+ relative_rpath(RELPATH)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}${RELPATH}")
+ ext_build_rpath()
+
else (BUILD_ITCL)
set(BRLCAD_ITCL_BUILD "OFF" CACHE STRING "Disable Itcl build" FORCE)
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
