Revision: 78036
http://sourceforge.net/p/brlcad/code/78036
Author: starseeker
Date: 2020-12-20 03:31:38 +0000 (Sun, 20 Dec 2020)
Log Message:
-----------
Mac Tk build logic is unique, and apparently has some new patterns we'll need
to consider. Experiment...
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/CMake/rpath_replace.cxx.in
Modified: brlcad/branches/extbuild/src/other/ext/CMake/rpath_replace.cxx.in
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/rpath_replace.cxx.in
2020-12-19 23:36:01 UTC (rev 78035)
+++ brlcad/branches/extbuild/src/other/ext/CMake/rpath_replace.cxx.in
2020-12-20 03:31:38 UTC (rev 78036)
@@ -8,11 +8,15 @@
{
int verbose = @EXTPROJ_VERBOSE@;
std::regex old_rpath("-rpath,\\$\\{LIB_RUNTIME_DIR\\}");
- if (argc < 3) {
- std::cerr << "Error: no file specified for processing or missing RPATH
to set.\n";
+ std::string new_rpath = std::string("-rpath,") +
std::string("@CMAKE_BUILD_RPATH@");
+
+ std::regex tk_dylib("-install_name [\"][$][{]DYLIB_INSTALL_DIR[}]/");
+ std::string tk_rpath = std::string("-install_name \"") +
std::string("@CMAKE_BINARY_DIR@/@LIB_DIR@/");
+
+ if (argc < 2) {
+ std::cerr << "Error: no file specified for processing.\n";
return -1;
}
- std::string new_rpath = std::string("-rpath,") +
std::string("@CMAKE_BUILD_RPATH@");
for (int i = 1; i < argc; i++) {
std::string cline;
@@ -30,6 +34,7 @@
while (std::getline(fs, cline)) {
std::string nline = std::regex_replace(cline, old_rpath, new_rpath);
+ nline = std::regex_replace(nline, tk_dylib, tk_rpath);
nfile_contents.append(nline);
nfile_contents.append("\n");
if (nline != cline) {
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
