Revision: 77745
http://sourceforge.net/p/brlcad/code/77745
Author: starseeker
Date: 2020-11-18 22:06:26 +0000 (Wed, 18 Nov 2020)
Log Message:
-----------
Shouldn't need to directly link Itcl/Itk any longer.
Modified Paths:
--------------
brlcad/branches/extbuild/src/archer/CMakeLists.txt
brlcad/branches/extbuild/src/bwish/CMakeLists.txt
brlcad/branches/extbuild/src/libtclcad/CMakeLists.txt
brlcad/branches/extbuild/src/mged/CMakeLists.txt
brlcad/branches/extbuild/src/rtwizard/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/archer/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/archer/CMakeLists.txt 2020-11-18 15:55:05 UTC
(rev 77744)
+++ brlcad/branches/extbuild/src/archer/CMakeLists.txt 2020-11-18 22:06:26 UTC
(rev 77745)
@@ -16,7 +16,7 @@
# 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_libs libtclcad libbu ${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/extbuild/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/bwish/CMakeLists.txt 2020-11-18 15:55:05 UTC
(rev 77744)
+++ brlcad/branches/extbuild/src/bwish/CMakeLists.txt 2020-11-18 22:06:26 UTC
(rev 77745)
@@ -12,7 +12,7 @@
list(REMOVE_DUPLICATES BWISH_INCLUDE_DIRS)
BRLCAD_INCLUDE_DIRS(BWISH_INCLUDE_DIRS)
- set(btclsh_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY})
+ set(btclsh_libs libtclcad libbu ${TCL_LIBRARY})
if(TARGET libtermio)
set(btclsh_libs ${btclsh_libs} libtermio)
@@ -28,7 +28,7 @@
# If we have Tk enabled, we want bwish too
if(BRLCAD_ENABLE_TK)
- set(bwish_libs libtclcad libbu ${TCL_LIBRARY} ${ITCL_LIBRARY}
${TK_LIBRARY} ${ITK_LIBRARY} ${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
+ set(bwish_libs libtclcad libbu ${TCL_LIBRARY} ${TK_LIBRARY}
${IMM32_LIBRARY} ${COMCTL32_LIBRARY})
if(TARGET libtermio)
set(bwish_libs ${bwish_libs} libtermio)
Modified: brlcad/branches/extbuild/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libtclcad/CMakeLists.txt 2020-11-18
15:55:05 UTC (rev 77744)
+++ brlcad/branches/extbuild/src/libtclcad/CMakeLists.txt 2020-11-18
22:06:26 UTC (rev 77745)
@@ -64,15 +64,11 @@
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)
@@ -86,6 +82,14 @@
# For anyone to do anything with tclcad, we need the libged plugins
add_dependencies(libtclcad ged_plugins)
+ if (TARGET itcl_stage)
+ add_dependencies(libtclcad itcl_stage)
+ endif (TARGET itcl_stage)
+
+ if (TARGET itk_stage)
+ add_dependencies(libtclcad itk_stage)
+ endif (TARGET itk_stage)
+
endif (BRLCAD_ENABLE_TCL)
set(tclcad_ignore_files
Modified: brlcad/branches/extbuild/src/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/mged/CMakeLists.txt 2020-11-18 15:55:05 UTC
(rev 77744)
+++ brlcad/branches/extbuild/src/mged/CMakeLists.txt 2020-11-18 22:06:26 UTC
(rev 77745)
@@ -54,7 +54,7 @@
endif (HAVE_WINDOWS_H)
-set(mged_libs libtclcad libged libwdb libdm libnmg ${ITCL_LIBRARY}
${ITK_LIBRARY} ${WS2_32_LIBRARY} ${OPENGL32_LIBRARY})
+set(mged_libs libtclcad libged libwdb libdm libnmg ${WS2_32_LIBRARY}
${OPENGL32_LIBRARY})
if(TARGET libtermio)
set(mged_libs ${mged_libs} libtermio)
endif(TARGET libtermio)
Modified: brlcad/branches/extbuild/src/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/rtwizard/CMakeLists.txt 2020-11-18
15:55:05 UTC (rev 77744)
+++ brlcad/branches/extbuild/src/rtwizard/CMakeLists.txt 2020-11-18
22:06:26 UTC (rev 77745)
@@ -20,7 +20,7 @@
endif (HAVE_WINDOWS_H)
- BRLCAD_ADDEXEC(rtwizard "${RTWIZARD_SRCS}"
"libtclcad;librt;libdm;liboptical;libicv;${ITCL_LIBRARY};${ITK_LIBRARY};Threads::Threads;${M_LIBRARY}")
+ BRLCAD_ADDEXEC(rtwizard "${RTWIZARD_SRCS}"
"libtclcad;librt;libdm;liboptical;libicv;Threads::Threads;${M_LIBRARY}")
ADD_TARGET_DEPS(rtwizard rt rtedge fbserv fb-png fb-pix fbclear fblabel
fbfree fbline fb-fb pix-bw bwmod bw-pix pixmatte pix-fb tkpng dm_plugins)
foreach(item ${tclindex_target_list})
add_dependencies(rtwizard ${item})
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
