Revision: 77474
http://sourceforge.net/p/brlcad/code/77474
Author: starseeker
Date: 2020-10-17 16:24:12 +0000 (Sat, 17 Oct 2020)
Log Message:
-----------
Specify some dependencies
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-17
16:19:38 UTC (rev 77473)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-17
16:24:12 UTC (rev 77474)
@@ -143,6 +143,10 @@
set(ITCL_LIBRARY itcl CACHE STRING "Building bundled itcl" FORCE)
set(ITCL_LIBRARIES itcl CACHE STRING "Building bundled itcl" FORCE)
+ if (TARGET tcl_stage)
+ add_dependencies(itcl_stage tcl_stage)
+ endif (TARGET tcl_stage)
+
SetTargetFolder(ITCL_BLD "Third Party Libraries")
else (BUILD_ITCL)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-17
16:19:38 UTC (rev 77473)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-17
16:24:12 UTC (rev 77474)
@@ -126,6 +126,14 @@
set(ITK_LIBRARY itk CACHE STRING "Building bundled itcl" FORCE)
set(ITK_LIBRARIES itk CACHE STRING "Building bundled itcl" FORCE)
+ if (TARGET itcl_stage)
+ add_dependencies(itk_stage itcl_stage)
+ endif (TARGET itcl_stage)
+
+ if (TARGET tk_stage)
+ add_dependencies(itk_stage tk_stage)
+ endif (TARGET tk_stage)
+
SetTargetFolder(ITK_BLD "Third Party Libraries")
else (DO_ITK_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-17
16:19:38 UTC (rev 77473)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-17
16:24:12 UTC (rev 77474)
@@ -224,6 +224,10 @@
# If something uses the stub, we're going to want the headers, etc. in place
add_dependencies(tkstub tk_stage)
+ if (TARGET tcl_stage)
+ add_dependencies(tk_stage tcl_stage)
+ endif (TARGET tcl_stage)
+
set(TK_LIBRARY tk CACHE STRING "Building bundled tk" FORCE)
set(TK_LIBRARIES tk CACHE STRING "Building bundled tk" FORCE)
set(TK_STUB_LIBRARY tkstub CACHE STRING "Building bundled tk" FORCE)
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
