Revision: 77489
http://sourceforge.net/p/brlcad/code/77489
Author: starseeker
Date: 2020-10-19 02:54:29 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
Add more dependencies
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-19
00:22:05 UTC (rev 77488)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-19
02:54:29 UTC (rev 77489)
@@ -66,11 +66,11 @@
set(ITCL_MINOR_VERSION 4)
set(ITCL_VERSION ${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
-
+ set(ITCL_DEPS)
if (TARGET tcl_stage)
- set(TCL_TARGET tcl_stage)
- else (TARGET tcl_stage)
- get_filename_component(TCLCONF_DIR "${TCL_LIBRARY}" DIRECTORY)
+ list(APPEND ITCL_DEPS tcl_stage)
+ list(APPEND ITCL_DEPS tclstub_stage)
+ list(APPEND ITCL_DEPS tclsh_exe_stage)
endif (TARGET tcl_stage)
set(ITCL_INSTDIR ${CMAKE_BINARY_ROOT}/ext/itcl3)
@@ -88,7 +88,7 @@
-DITCL_STATIC=${BUILD_STATIC_LIBS}
-DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_VERSION=${TCL_VERSION}
- DEPENDS ${TCL_TARGET}
+ DEPENDS ${ITCL_DEPS}
)
if (NOT MSVC)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-19
00:22:05 UTC (rev 77488)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-19
02:54:29 UTC (rev 77489)
@@ -48,6 +48,7 @@
set(TCL_TARGET ON)
list(APPEND ITK_DEPS tcl_stage)
list(APPEND ITK_DEPS tclstub_stage)
+ list(APPEND ITK_DEPS tclsh_exe_stage)
endif (TARGET tcl_stage)
if (TARGET itcl_stage)
@@ -59,6 +60,7 @@
if (TARGET tk_stage)
list(APPEND ITK_DEPS tk_stage)
list(APPEND ITK_DEPS tkstub_stage)
+ list(APPEND ITK_DEPS wish_exe_stage)
endif (TARGET tk_stage)
set(ITK_INSTDIR ${CMAKE_BINARY_ROOT}/ext/itk3)
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
