Revision: 76760
http://sourceforge.net/p/brlcad/code/76760
Author: starseeker
Date: 2020-08-14 19:42:12 +0000 (Fri, 14 Aug 2020)
Log Message:
-----------
Couple build system fixes, add debugging message to dm_init.cpp
Modified Paths:
--------------
brlcad/trunk/src/libdm/dm_init.cpp
brlcad/trunk/src/libdm/plot/CMakeLists.txt
brlcad/trunk/src/libdm/postscript/CMakeLists.txt
Modified: brlcad/trunk/src/libdm/dm_init.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm_init.cpp 2020-08-14 19:11:33 UTC (rev 76759)
+++ brlcad/trunk/src/libdm/dm_init.cpp 2020-08-14 19:42:12 UTC (rev 76760)
@@ -106,6 +106,10 @@
const struct dm *d = plugin->p;
const char *dname = dm_get_name(d);
+ if (!dname) {
+ bu_vls_printf(dm_init_msg_str, "Warning - file '%s' does not
provide a display manager name (?), skipping\n", pfile);
+ continue;
+ }
std::string key(dname);
std::transform(key.begin(), key.end(), key.begin(), [](unsigned
char c){ return std::tolower(c); });
if (dm_map.find(key) != dm_map.end()) {
Modified: brlcad/trunk/src/libdm/plot/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-14 19:11:33 UTC (rev
76759)
+++ brlcad/trunk/src/libdm/plot/CMakeLists.txt 2020-08-14 19:42:12 UTC (rev
76760)
@@ -5,6 +5,8 @@
if(BRLCAD_ENABLE_TCL)
+ find_package(TCL)
+
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${BRLCAD_BINARY_DIR}/include
Modified: brlcad/trunk/src/libdm/postscript/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-14 19:11:33 UTC
(rev 76759)
+++ brlcad/trunk/src/libdm/postscript/CMakeLists.txt 2020-08-14 19:42:12 UTC
(rev 76760)
@@ -17,7 +17,7 @@
add_definitions(-DDM_PLUGIN)
add_library(dm-ps SHARED ${PS_SRCS})
- target_link_libraries(dm-ps libdm libbu)
+ target_link_libraries(dm-ps libdm libbu ${TCL_LIBRARY})
set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
VALIDATE_STYLE(dm-ps "${PS_SRCS}")
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
