Revision: 77743
http://sourceforge.net/p/brlcad/code/77743
Author: starseeker
Date: 2020-11-18 12:58:20 +0000 (Wed, 18 Nov 2020)
Log Message:
-----------
Pass tk flag to CMake subbuilds
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/itcl.cmake
brlcad/branches/extbuild/src/other/ext/itk.cmake
Modified: brlcad/branches/extbuild/src/other/ext/itcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-18 04:32:18 UTC
(rev 77742)
+++ brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-18 12:58:20 UTC
(rev 77743)
@@ -98,6 +98,7 @@
-DINCLUDE_DIR=${INCLUDE_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DITCL_STATIC=${BUILD_STATIC_LIBS}
+ -DTCL_ENABLE_TK=${TCL_ENABLE_TK}
-DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_VERSION=${TCL_VERSION}
DEPENDS ${ITCL_DEPS}
Modified: brlcad/branches/extbuild/src/other/ext/itk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-11-18 04:32:18 UTC
(rev 77742)
+++ brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-11-18 12:58:20 UTC
(rev 77743)
@@ -76,6 +76,7 @@
-DINCLUDE_DIR=${INCLUDE_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
+ -DTCL_ENABLE_TK=${TCL_ENABLE_TK}
-DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DITCL_ROOT=$<$<BOOL:${ITCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_VERSION=${TCL_VERSION}
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