Revision: 77744
http://sourceforge.net/p/brlcad/code/77744
Author: starseeker
Date: 2020-11-18 15:55:05 +0000 (Wed, 18 Nov 2020)
Log Message:
-----------
Fix set statement syntax, replace DYLIB_INSTALL_DIR setting in macosx configure.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/CMake/tcl_replace.cxx.in
brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/tcl.cmake
brlcad/branches/extbuild/src/other/ext/tk.cmake
Modified: brlcad/branches/extbuild/src/other/ext/CMake/tcl_replace.cxx.in
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/tcl_replace.cxx.in
2020-11-18 12:58:20 UTC (rev 77743)
+++ brlcad/branches/extbuild/src/other/ext/CMake/tcl_replace.cxx.in
2020-11-18 15:55:05 UTC (rev 77744)
@@ -98,6 +98,11 @@
std::string tbl_runtimedir_new = std::string("\"") +
std::string(CMAKE_INSTALL_PREFIX) + std::string(sep) + std::string(LIB_DIR) +
std::string(TKTABLE_RUNTIME_DIR) + std::string("\"");
strings.push_back(tbl_runtimedir_new);
+ std::regex dylib_dir_regex("[$][{]DYLIB_INSTALL_DIR[}]");
+ regexes.push_back(dylib_dir_regex);
+ std::string dylib_dir_new = std::string("@rpath");
+ strings.push_back(dylib_dir_new);
+
std::regex zname_regex("for ac_lib in z");
regexes.push_back(zname_regex);
std::string zname_new = std::string("for ac_lib in ") +
std::string(ZLIB_NAME);
Modified: brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-11-18
12:58:20 UTC (rev 77743)
+++ brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-11-18
15:55:05 UTC (rev 77744)
@@ -301,8 +301,8 @@
set(BUILD_STATIC_LIBS ON)
if (BRLCAD_ENABLE_TK)
# For FindTCL.cmake
- set(TCL_ENABLE_TK ON BOOL "enable tk" CACHE)
-endif (NOT BRLCAD_ENABLE_TK)
+ set(TCL_ENABLE_TK ON CACHE BOOL "enable tk")
+endif (BRLCAD_ENABLE_TK)
include(${CMAKE_CURRENT_SOURCE_DIR}/tcl.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/tk.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/itcl.cmake)
Modified: brlcad/branches/extbuild/src/other/ext/tcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-18 12:58:20 UTC
(rev 77743)
+++ brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-18 15:55:05 UTC
(rev 77744)
@@ -43,7 +43,7 @@
# Tcl's own build will think are the final paths. Rather than attempt build
system trickery we simply
# hard set the values in the source files by rewriting them.
if (NOT TARGET tcl_replace)
- configure_file(${BDEPS_CMAKE_DIR}/tcl_replace.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx)
+ configure_file(${BDEPS_CMAKE_DIR}/tcl_replace.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx @ONLY)
add_executable(tcl_replace ${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx)
endif (NOT TARGET tcl_replace)
DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx)
Modified: brlcad/branches/extbuild/src/other/ext/tk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-18 12:58:20 UTC
(rev 77743)
+++ brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-18 15:55:05 UTC
(rev 77744)
@@ -30,7 +30,7 @@
# Tcl's own build will think are the final paths. Rather than attempt build
system trickery we simply
# hard set the values in the source files by rewriting them.
if (NOT TARGET tcl_replace)
- configure_file(${BDEPS_CMAKE_DIR}/tcl_replace.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx)
+ configure_file(${BDEPS_CMAKE_DIR}/tcl_replace.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx @ONLY)
add_executable(tcl_replace ${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx)
endif (NOT TARGET tcl_replace)
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
