Revision: 77416
http://sourceforge.net/p/brlcad/code/77416
Author: starseeker
Date: 2020-10-13 19:27:37 +0000 (Tue, 13 Oct 2020)
Log Message:
-----------
Update summary reporting
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Summary.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
Modified: brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Summary.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Summary.cmake
2020-10-13 19:25:05 UTC (rev 77415)
+++ brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Summary.cmake
2020-10-13 19:27:37 UTC (rev 77416)
@@ -34,12 +34,6 @@
#
###
-# TODO - update summary printing to reflect new build structure -
-# will need to have the superbuild report which components are
-# enabled, rather than the logic below which uses third party
-# build settings no longer in use.
-
-
#
# This file contains the CMake routines that summarize the results
# of the BRL-CAD configure process.
@@ -284,8 +278,7 @@
# Make sets to use for iteration over all report items
set(BUILD_REPORT_ITEMS
- TCL TK INCRTCL IWIDGETS TKHTML TKTABLE PNG REGEX ZLIB
- TERMLIB UTAHRLE OPENNURBS SC)
+ TCL TK INCRTCL IWIDGETS PNG REGEX ZLIB SC)
set(FEATURE_REPORT_ITEMS
BRLCAD_ENABLE_OPENGL
@@ -367,8 +360,8 @@
# Set state messages for standard components
foreach(ITEM ${THIRD_PARTY_COMPONENT_LIST})
- get_directory_property(BRLCAD_${ITEM}_BUILD DIRECTORY src/other DEFINITION
BRLCAD_${ITEM}_BUILD)
- get_directory_property(BRLCAD_${ITEM}_NOTFOUND DIRECTORY src/other
DEFINITION BRLCAD_${ITEM}_NOTFOUND)
+ get_directory_property(BRLCAD_${ITEM}_BUILD DIRECTORY src/superbuild
DEFINITION BRLCAD_${ITEM}_BUILD)
+ get_directory_property(BRLCAD_${ITEM}_NOTFOUND DIRECTORY src/superbuild
DEFINITION BRLCAD_${ITEM}_NOTFOUND)
if("${BRLCAD_${ITEM}_BUILD}" STREQUAL "OFF" AND BRLCAD_${ITEM}_NOTFOUND)
set(BRLCAD_${ITEM}_BUILD "OFF!")
endif("${BRLCAD_${ITEM}_BUILD}" STREQUAL "OFF" AND BRLCAD_${ITEM}_NOTFOUND)
@@ -375,10 +368,10 @@
endforeach(ITEM ${THIRD_PARTY_COMPONENT_LIST})
# IncrTcl is both ITCL and ITK - handle the various possibilities here
- get_directory_property(BRLCAD_ITCL_BUILD DIRECTORY src/other DEFINITION
BRLCAD_ITCL_BUILD)
- get_directory_property(BRLCAD_ITK_BUILD DIRECTORY src/other DEFINITION
BRLCAD_ITK_BUILD)
- get_directory_property(BRLCAD_ITCL_NOTFOUND DIRECTORY src/other DEFINITION
BRLCAD_ITCL_NOTFOUND)
- get_directory_property(BRLCAD_ITK_NOTFOUND DIRECTORY src/other DEFINITION
BRLCAD_ITK_NOTFOUND)
+ get_directory_property(BRLCAD_ITCL_BUILD DIRECTORY src/superbuild DEFINITION
BRLCAD_ITCL_BUILD)
+ get_directory_property(BRLCAD_ITK_BUILD DIRECTORY src/superbuild DEFINITION
BRLCAD_ITK_BUILD)
+ get_directory_property(BRLCAD_ITCL_NOTFOUND DIRECTORY src/superbuild
DEFINITION BRLCAD_ITCL_NOTFOUND)
+ get_directory_property(BRLCAD_ITK_NOTFOUND DIRECTORY src/superbuild
DEFINITION BRLCAD_ITK_NOTFOUND)
if(BRLCAD_ITCL_BUILD AND BRLCAD_ITK_BUILD)
set(BRLCAD_INCRTCL_BUILD ON)
else(BRLCAD_ITCL_BUILD AND BRLCAD_ITK_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-13
19:25:05 UTC (rev 77415)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-13
19:27:37 UTC (rev 77416)
@@ -57,6 +57,9 @@
ITCL_TEST(BUILD_ITCL)
if (BUILD_ITCL)
+
+ set(BRLCAD_ITCL_BUILD "ON" CACHE STRING "Enable Itcl build" FORCE)
+
set(ITCL_SRC_DIR
"${CMAKE_CURRENT_BINARY_DIR}/ITCL_BLD-prefix/src/ITCL_BLD")
set(ITCL_MAJOR_VERSION 3)
@@ -137,8 +140,11 @@
SetTargetFolder(ITCL_BLD "Third Party Libraries")
+ else (BUILD_ITCL)
+
+ set(BRLCAD_ITCL_BUILD "OFF" CACHE STRING "Disable Itcl build" FORCE)
+
endif (BUILD_ITCL)
-
endif (BRLCAD_ENABLE_TCL)
# Local Variables:
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-13
19:25:05 UTC (rev 77415)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-13
19:27:37 UTC (rev 77416)
@@ -35,6 +35,8 @@
if (DO_ITK_BUILD)
+ set(BRLCAD_ITK_BUILD "ON" CACHE STRING "Enable Itk build" FORCE)
+
set(ITK_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/ITK_BLD-prefix/src/ITK_BLD")
set(ITK_MAJOR_VERSION 3)
@@ -126,6 +128,10 @@
SetTargetFolder(ITK_BLD "Third Party Libraries")
+ else (DO_ITK_BUILD)
+
+ set(BRLCAD_ITK_BUILD "OFF" CACHE STRING "Disable Itk build" FORCE)
+
endif (DO_ITK_BUILD)
endif (BRLCAD_ENABLE_TK)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-13 19:25:05 UTC (rev 77415)
+++ brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-13 19:27:37 UTC (rev 77416)
@@ -19,6 +19,8 @@
if (DO_IWIDGETS_BUILD)
+ set(BRLCAD_IWIDGETS_BUILD "ON" CACHE STRING "Enable Iwidgets build" FORCE)
+
set(IWIDGETS_SRC_DIR
"${CMAKE_CURRENT_BINARY_DIR}/IWIDGETS_BLD-prefix/src/IWIDGETS_BLD")
set(IWIDGETS_MAJOR_VERSION 4)
@@ -156,6 +158,10 @@
SetTargetFolder(IWIDGETS_BLD "Third Party Libraries")
+ else (DO_IWIDGETS_BUILD)
+
+ set(BRLCAD_IWIDGETS_BUILD "OFF" CACHE STRING "Disable Iwidgets build"
FORCE)
+
endif (DO_IWIDGETS_BUILD)
endif (BRLCAD_ENABLE_TK)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-13
19:25:05 UTC (rev 77415)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-13
19:27:37 UTC (rev 77416)
@@ -11,6 +11,7 @@
if (BRLCAD_ENABLE_TCL AND BRLCAD_ENABLE_TK AND TK_DO_BUILD)
set(HAVE_TK 1 CACHE STRING "C level Tk flag" FORCE)
+ set(BRLCAD_TK_BUILD ON CACHE STRING "Enabling Tk build" FORCE)
if (TARGET tcl_stage)
# If we're building against a compiled Tcl and not a system Tcl,
@@ -232,7 +233,12 @@
elseif (BRLCAD_ENABLE_TCL AND BRLCAD_ENABLE_TK)
set(HAVE_TK 1 CACHE STRING "C level Tk flag" FORCE)
+ set(BRLCAD_TK_BUILD OFF CACHE STRING "Disabling Tk build" FORCE)
+elseif (NOT BRLCAD_ENABLE_TK)
+
+ set(BRLCAD_TK_BUILD "Disabled" CACHE STRING "Disabling Tk build" FORCE)
+
endif (BRLCAD_ENABLE_TCL AND BRLCAD_ENABLE_TK AND TK_DO_BUILD)
# Local Variables:
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
