Revision: 77292
http://sourceforge.net/p/brlcad/code/77292
Author: starseeker
Date: 2020-09-30 21:04:56 +0000 (Wed, 30 Sep 2020)
Log Message:
-----------
Fix Tk stub naming, disable debug msgs. MGED and Archer now launch 'installed'
into the superbuild directory. The question now becomes, how to create a
superbuild install.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/misc/CMake/FindTCL.cmake
brlcad/branches/thirdparty_rework/src/libtclcad/auto_path.c
brlcad/branches/thirdparty_rework/src/other/tkhtml/CMake/FindTCL.cmake
brlcad/branches/thirdparty_rework/src/other/tktable/CMake/FindTCL.cmake
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindTCL.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindTCL.cmake 2020-09-30
20:53:17 UTC (rev 77291)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindTCL.cmake 2020-09-30
21:04:56 UTC (rev 77292)
@@ -241,7 +241,7 @@
)
endif(NOT TK_LIBRARY)
-set(TKSTUB_POSSIBLE_LIB_NAMES
+set(TK_STUB_POSSIBLE_LIB_NAMES
tkstub
tkstub${TCL_LIBRARY_VERSION} tkstub${TCL_TCLSH_VERSION}
tkstub${TK_WISH_VERSION}
tkstub87 tkstub8.7
@@ -253,23 +253,23 @@
tkstub80 tkstub8.0
)
-if(NOT TKSTUB_LIBRARY)
+if(NOT TK_STUB_LIBRARY)
foreach(search ${_TCL_SEARCHES})
- find_library(TKSTUB_LIBRARY
- NAMES ${TKSTUB_POSSIBLE_LIB_NAMES}
+ find_library(TK_STUB_LIBRARY
+ NAMES ${TK_STUB_POSSIBLE_LIB_NAMES}
NAMES_PER_DIR ${${search}}
PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
)
endforeach()
endif()
-if(NOT TKSTUB_LIBRARY)
+if(NOT TK_STUB_LIBRARY)
find_library(TK_STUB_LIBRARY
- NAMES ${TKSTUB_POSSIBLE_LIB_NAMES}
+ NAMES ${TK_STUB_POSSIBLE_LIB_NAMES}
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
)
endif()
-set(TTKSTUB_POSSIBLE_LIB_NAMES
+set(TTK_STUB_POSSIBLE_LIB_NAMES
ttkstub
ttkstub${TCL_LIBRARY_VERSION} ttkstub${TCL_TCLSH_VERSION}
ttkstub${TK_WISH_VERSION}
ttkstub88 ttkstub8.8
@@ -278,18 +278,18 @@
ttkstub85 ttkstub8.5
)
-if(NOT TTKSTUB_LIBRARY)
+if(NOT TTK_STUB_LIBRARY)
foreach(search ${_TCL_SEARCHES})
- find_library(TTKSTUB_LIBRARY
- NAMES ${TTKSTUB_POSSIBLE_LIB_NAMES}
+ find_library(TTK_STUB_LIBRARY
+ NAMES ${TTK_STUB_POSSIBLE_LIB_NAMES}
NAMES_PER_DIR ${${search}}
PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
)
endforeach()
endif()
-if(NOT TTKSTUB_LIBRARY)
+if(NOT TTK_STUB_LIBRARY)
find_library(TTK_STUB_LIBRARY
- NAMES ${TTKSTUB_POSSIBLE_LIB_NAMES}
+ NAMES ${TTK_STUB_POSSIBLE_LIB_NAMES}
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
)
endif()
Modified: brlcad/branches/thirdparty_rework/src/libtclcad/auto_path.c
===================================================================
--- brlcad/branches/thirdparty_rework/src/libtclcad/auto_path.c 2020-09-30
20:53:17 UTC (rev 77291)
+++ brlcad/branches/thirdparty_rework/src/libtclcad/auto_path.c 2020-09-30
21:04:56 UTC (rev 77292)
@@ -345,13 +345,13 @@
const char *path = (const char *)BU_PTBL_GET(&paths, i);
/* make sure it exists before appending */
if (bu_file_exists(path, NULL)) {
- printf("APPENDING: %s\n", path);
+ //printf("APPENDING: %s\n", path);
struct bu_vls lappend = BU_VLS_INIT_ZERO;
bu_vls_sprintf(&lappend, "lappend auto_path {%s}", path);
(void)Tcl_Eval(interp, bu_vls_addr(&lappend));
bu_vls_free(&lappend);
} else {
- printf("NOT APPENDING: %s\n", path);
+ //printf("NOT APPENDING: %s\n", path);
continue;
}
Modified: brlcad/branches/thirdparty_rework/src/other/tkhtml/CMake/FindTCL.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/tkhtml/CMake/FindTCL.cmake
2020-09-30 20:53:17 UTC (rev 77291)
+++ brlcad/branches/thirdparty_rework/src/other/tkhtml/CMake/FindTCL.cmake
2020-09-30 21:04:56 UTC (rev 77292)
@@ -241,7 +241,7 @@
)
endif(NOT TK_LIBRARY)
-set(TKSTUB_POSSIBLE_LIB_NAMES
+set(TK_STUB_POSSIBLE_LIB_NAMES
tkstub
tkstub${TCL_LIBRARY_VERSION} tkstub${TCL_TCLSH_VERSION}
tkstub${TK_WISH_VERSION}
tkstub87 tkstub8.7
@@ -253,23 +253,23 @@
tkstub80 tkstub8.0
)
-if(NOT TKSTUB_LIBRARY)
+if(NOT TK_STUB_LIBRARY)
foreach(search ${_TCL_SEARCHES})
- find_library(TKSTUB_LIBRARY
- NAMES ${TKSTUB_POSSIBLE_LIB_NAMES}
+ find_library(TK_STUB_LIBRARY
+ NAMES ${TK_STUB_POSSIBLE_LIB_NAMES}
NAMES_PER_DIR ${${search}}
PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
)
endforeach()
endif()
-if(NOT TKSTUB_LIBRARY)
+if(NOT TK_STUB_LIBRARY)
find_library(TK_STUB_LIBRARY
- NAMES ${TKSTUB_POSSIBLE_LIB_NAMES}
+ NAMES ${TK_STUB_POSSIBLE_LIB_NAMES}
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
)
endif()
-set(TTKSTUB_POSSIBLE_LIB_NAMES
+set(TTK_STUB_POSSIBLE_LIB_NAMES
ttkstub
ttkstub${TCL_LIBRARY_VERSION} ttkstub${TCL_TCLSH_VERSION}
ttkstub${TK_WISH_VERSION}
ttkstub88 ttkstub8.8
@@ -278,18 +278,18 @@
ttkstub85 ttkstub8.5
)
-if(NOT TTKSTUB_LIBRARY)
+if(NOT TTK_STUB_LIBRARY)
foreach(search ${_TCL_SEARCHES})
- find_library(TTKSTUB_LIBRARY
- NAMES ${TTKSTUB_POSSIBLE_LIB_NAMES}
+ find_library(TTK_STUB_LIBRARY
+ NAMES ${TTK_STUB_POSSIBLE_LIB_NAMES}
NAMES_PER_DIR ${${search}}
PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
)
endforeach()
endif()
-if(NOT TTKSTUB_LIBRARY)
+if(NOT TTK_STUB_LIBRARY)
find_library(TTK_STUB_LIBRARY
- NAMES ${TTKSTUB_POSSIBLE_LIB_NAMES}
+ NAMES ${TTK_STUB_POSSIBLE_LIB_NAMES}
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
)
endif()
Modified:
brlcad/branches/thirdparty_rework/src/other/tktable/CMake/FindTCL.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/tktable/CMake/FindTCL.cmake
2020-09-30 20:53:17 UTC (rev 77291)
+++ brlcad/branches/thirdparty_rework/src/other/tktable/CMake/FindTCL.cmake
2020-09-30 21:04:56 UTC (rev 77292)
@@ -241,7 +241,7 @@
)
endif(NOT TK_LIBRARY)
-set(TKSTUB_POSSIBLE_LIB_NAMES
+set(TK_STUB_POSSIBLE_LIB_NAMES
tkstub
tkstub${TCL_LIBRARY_VERSION} tkstub${TCL_TCLSH_VERSION}
tkstub${TK_WISH_VERSION}
tkstub87 tkstub8.7
@@ -253,23 +253,23 @@
tkstub80 tkstub8.0
)
-if(NOT TKSTUB_LIBRARY)
+if(NOT TK_STUB_LIBRARY)
foreach(search ${_TCL_SEARCHES})
- find_library(TKSTUB_LIBRARY
- NAMES ${TKSTUB_POSSIBLE_LIB_NAMES}
+ find_library(TK_STUB_LIBRARY
+ NAMES ${TK_STUB_POSSIBLE_LIB_NAMES}
NAMES_PER_DIR ${${search}}
PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
)
endforeach()
endif()
-if(NOT TKSTUB_LIBRARY)
+if(NOT TK_STUB_LIBRARY)
find_library(TK_STUB_LIBRARY
- NAMES ${TKSTUB_POSSIBLE_LIB_NAMES}
+ NAMES ${TK_STUB_POSSIBLE_LIB_NAMES}
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
)
endif()
-set(TTKSTUB_POSSIBLE_LIB_NAMES
+set(TTK_STUB_POSSIBLE_LIB_NAMES
ttkstub
ttkstub${TCL_LIBRARY_VERSION} ttkstub${TCL_TCLSH_VERSION}
ttkstub${TK_WISH_VERSION}
ttkstub88 ttkstub8.8
@@ -278,18 +278,18 @@
ttkstub85 ttkstub8.5
)
-if(NOT TTKSTUB_LIBRARY)
+if(NOT TTK_STUB_LIBRARY)
foreach(search ${_TCL_SEARCHES})
- find_library(TTKSTUB_LIBRARY
- NAMES ${TTKSTUB_POSSIBLE_LIB_NAMES}
+ find_library(TTK_STUB_LIBRARY
+ NAMES ${TTK_STUB_POSSIBLE_LIB_NAMES}
NAMES_PER_DIR ${${search}}
PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
)
endforeach()
endif()
-if(NOT TTKSTUB_LIBRARY)
+if(NOT TTK_STUB_LIBRARY)
find_library(TTK_STUB_LIBRARY
- NAMES ${TTKSTUB_POSSIBLE_LIB_NAMES}
+ NAMES ${TTK_STUB_POSSIBLE_LIB_NAMES}
PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
)
endif()
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
