Revision: 77107
http://sourceforge.net/p/brlcad/code/77107
Author: starseeker
Date: 2020-09-12 03:28:03 +0000 (Sat, 12 Sep 2020)
Log Message:
-----------
On HaikuOS we can actually have an unset TK_INCLUDE_PATH - check in those build
files that use it.
Modified Paths:
--------------
brlcad/branches/RELEASE/src/archer/CMakeLists.txt
brlcad/branches/RELEASE/src/brlman/CMakeLists.txt
brlcad/branches/RELEASE/src/bwish/CMakeLists.txt
brlcad/branches/RELEASE/src/libtclcad/CMakeLists.txt
brlcad/branches/RELEASE/src/mged/CMakeLists.txt
Modified: brlcad/branches/RELEASE/src/archer/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/archer/CMakeLists.txt 2020-09-11 19:15:21 UTC
(rev 77106)
+++ brlcad/branches/RELEASE/src/archer/CMakeLists.txt 2020-09-12 03:28:03 UTC
(rev 77107)
@@ -4,18 +4,20 @@
${TCL_INCLUDE_PATH}
${TK_INCLUDE_PATH}
)
+if (TK_INCLUDE_PATH)
+ set(ARCHER_INCLUDE_DIRS ${ARCHER_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+endif (TK_INCLUDE_PATH)
list(REMOVE_DUPLICATES ARCHER_INCLUDE_DIRS)
BRLCAD_INCLUDE_DIRS(ARCHER_INCLUDE_DIRS)
BRLCAD_ADDDATA(archer_launch.tcl tclscripts/archer)
-set(archer_libs libtclcad libbu ${ITCL_LIBRARY} ${ITK_LIBRARY} ${TCL_LIBRARY}
${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
-
# NOTE: Building "GUI" doesn't matter except on Windows, but on Windows archer
# currently works only in graphical mode - might as well behave "nicely" there.
# If/when we add MGED's ability to work in "classic" mode, Archer will have
# to be built as a non-GUI application (or we'll have to build two executables)
if(BRLCAD_ENABLE_TK)
+ set(archer_libs libtclcad libbu ${ITCL_LIBRARY} ${ITK_LIBRARY}
${TCL_LIBRARY} ${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
set(archer_srcs archer.c)
if (HAVE_WINDOWS_H)
# To associate an icon with the application for Windows (needed
Modified: brlcad/branches/RELEASE/src/brlman/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/brlman/CMakeLists.txt 2020-09-11 19:15:21 UTC
(rev 77106)
+++ brlcad/branches/RELEASE/src/brlman/CMakeLists.txt 2020-09-12 03:28:03 UTC
(rev 77107)
@@ -5,6 +5,9 @@
${TCL_INCLUDE_PATH}
${TK_INCLUDE_PATH}
)
+if (TARGET Tkhtml)
+ set(BRLMAN_INCLUDE_DIRS ${BRLMAN_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+endif (TARGET Tkhtml)
list(REMOVE_DUPLICATES BRLMAN_INCLUDE_DIRS)
BRLCAD_INCLUDE_DIRS(BRLMAN_INCLUDE_DIRS)
Modified: brlcad/branches/RELEASE/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/bwish/CMakeLists.txt 2020-09-11 19:15:21 UTC
(rev 77106)
+++ brlcad/branches/RELEASE/src/bwish/CMakeLists.txt 2020-09-12 03:28:03 UTC
(rev 77107)
@@ -7,6 +7,9 @@
${TCL_INCLUDE_PATH}
${TK_INCLUDE_PATH}
)
+ if (TK_INCLUDE_PATH)
+ set(BWISH_INCLUDE_DIRS ${BWISH_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+ endif (TK_INCLUDE_PATH)
list(REMOVE_DUPLICATES BWISH_INCLUDE_DIRS)
BRLCAD_INCLUDE_DIRS(BWISH_INCLUDE_DIRS)
Modified: brlcad/branches/RELEASE/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libtclcad/CMakeLists.txt 2020-09-11
19:15:21 UTC (rev 77106)
+++ brlcad/branches/RELEASE/src/libtclcad/CMakeLists.txt 2020-09-12
03:28:03 UTC (rev 77107)
@@ -39,9 +39,12 @@
${BN_INCLUDE_DIRS}
${BU_INCLUDE_DIRS}
${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
)
+ if (TK_INCLUDE_PATH)
+ set(TCLCAD_INCLUDE_DIRS ${TCLCAD_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+ endif (TK_INCLUDE_PATH)
+
# Include directories only needed by the implementation
set(TCLCAD_LOCAL_INCLUDE_DIRS
${PNG_INCLUDE_DIRS}
@@ -53,7 +56,24 @@
set(TCLCAD_XLIBS ${TCLCAD_XLIBS} ${X11_LIBRARIES})
endif(BRLCAD_ENABLE_X11)
- BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}"
"libged;libdm;libdm;libnmg;libbn;libbu;${TCL_LIBRARY};${TK_LIBRARY};${ITCL_LIBRARY};${ITK_LIBRARY};${TCLCAD_XLIBS}")
+ set(TCLCAD_LIBS
+ libged
+ libdm
+ libnmg
+ libbn
+ libbu
+ ${TCL_LIBRARY}
+ ${ITCL_LIBRARY}
+ ${TCLCAD_XLIBS}
+ )
+ if (TK_LIBRARY)
+ set(TCLCAD_LIBS ${TCLCAD_LIBS} ${TK_LIBRARY})
+ endif (TK_LIBRARY)
+ if (ITK_LIBRARY)
+ set(TCLCAD_LIBS ${TCLCAD_LIBS} ${ITK_LIBRARY})
+ endif (ITK_LIBRARY)
+
+ BRLCAD_ADDLIB(libtclcad "${LIBTCLCAD_SRCS}" "${TCLCAD_LIBS}")
set_target_properties(libtclcad PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (TARGET itcl_pkgIndex)
add_dependencies(libtclcad itcl_pkgIndex)
Modified: brlcad/branches/RELEASE/src/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/mged/CMakeLists.txt 2020-09-11 19:15:21 UTC
(rev 77106)
+++ brlcad/branches/RELEASE/src/mged/CMakeLists.txt 2020-09-12 03:28:03 UTC
(rev 77107)
@@ -58,6 +58,9 @@
if(TARGET libtermio)
set(mged_libs ${mged_libs} libtermio)
endif(TARGET libtermio)
+if (ITK_LIBRARY)
+ set(mged_libs ${mged_libs} ${ITK_LIBRARY})
+endif (ITK_LIBRARY)
# Ideally we'd build as GUI for Windows to avoid the command window popping up,
# but I'm not sure if that would be a problem for scripting with mged.exe on
@@ -78,6 +81,9 @@
${TERMIO_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
)
+ if (TK_INCLUDE_PATH)
+ set(MGED_INCLUDE_DIRS ${MGED_INCLUDE_DIRS} ${TK_INCLUDE_PATH})
+ endif (TK_INCLUDE_PATH)
BRLCAD_INCLUDE_DIRS(MGED_INCLUDE_DIRS)
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
