Revision: 76220
http://sourceforge.net/p/brlcad/code/76220
Author: starseeker
Date: 2020-06-26 16:01:57 +0000 (Fri, 26 Jun 2020)
Log Message:
-----------
With libdm backends as plugins, we no longer have implicit link time
dependencies to ensure they are built before applications. Make the key
backends explicit dependencies of Archer, MGED and rtwizard
Modified Paths:
--------------
brlcad/trunk/src/archer/CMakeLists.txt
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/rtwizard/CMakeLists.txt
Modified: brlcad/trunk/src/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/archer/CMakeLists.txt 2020-06-26 15:13:54 UTC (rev
76219)
+++ brlcad/trunk/src/archer/CMakeLists.txt 2020-06-26 16:01:57 UTC (rev
76220)
@@ -19,7 +19,7 @@
BRLCAD_ADDEXEC(archer archer.c "${archer_libs}" GUI)
add_dependencies(archer archer_launch_tcl_cp)
add_dependencies(archer rtwizard)
- ADD_TARGET_DEPS(archer Tkhtml Tktable itcl_pkgIndex itk_pkgIndex)
+ ADD_TARGET_DEPS(archer Tkhtml Tktable itcl_pkgIndex itk_pkgIndex dm-ogl
dm-wgl)
foreach(item ${tclindex_target_list})
add_dependencies(archer ${item})
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2020-06-26 15:13:54 UTC (rev
76219)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2020-06-26 16:01:57 UTC (rev
76220)
@@ -74,6 +74,7 @@
BRLCAD_INCLUDE_DIRS(MGED_INCLUDE_DIRS)
BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "${mged_libs}")
+ ADD_TARGET_DEPS(mged Tkhtml Tktable itcl_pkgIndex itk_pkgIndex dm-ogl dm-wgl)
# mged depends on the creation/installation of all the
# tclscripts.
Modified: brlcad/trunk/src/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-06-26 15:13:54 UTC (rev
76219)
+++ brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-06-26 16:01:57 UTC (rev
76220)
@@ -13,7 +13,7 @@
)
BRLCAD_ADDEXEC(rtwizard "${RTWIZARD_SRCS}"
"libtclcad;librt;libdm;liboptical;libicv;${ITCL_LIBRARY};${ITK_LIBRARY};${CMAKE_THREAD_LIBS_INIT};${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)
+ 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-ogl dm-wgl)
foreach(item ${tclindex_target_list})
add_dependencies(rtwizard ${item})
endforeach(item ${tclindex_target_list})
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
