Revision: 77733
http://sourceforge.net/p/brlcad/code/77733
Author: starseeker
Date: 2020-11-12 21:13:49 +0000 (Thu, 12 Nov 2020)
Log Message:
-----------
Adjust deps
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/tk.cmake
Modified: brlcad/branches/extbuild/src/other/ext/tk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-12 20:19:51 UTC
(rev 77732)
+++ brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-12 21:13:49 UTC
(rev 77733)
@@ -16,6 +16,7 @@
set(TK_MAJOR_VERSION 8)
set(TK_MINOR_VERSION 6)
set(TK_PATCH_VERSION 10)
+ set(TK_DEPS)
if (TARGET tcl_stage)
# If we're building against a compiled Tcl and not a system Tcl,
@@ -25,6 +26,7 @@
set(TCL_MINOR_VERSION 6)
set(TCL_PATCH_VERSION 10)
set(TCL_TARGET tcl_stage)
+ list(APPEND TK_DEPS tcl_stage tclstub_stage tclsh_exe_stage)
else (TARGET tcl_stage)
get_filename_component(TCLCONF_DIR "${TCL_LIBRARY}" DIRECTORY)
endif (TARGET tcl_stage)
@@ -68,7 +70,7 @@
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/tcl
- DEPENDS ${TCL_TARGET}
+ DEPENDS ${TK_DEPS}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/TK_BLD-prefix")
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
