Revision: 77969
http://sourceforge.net/p/brlcad/code/77969
Author: starseeker
Date: 2020-12-15 19:07:07 +0000 (Tue, 15 Dec 2020)
Log Message:
-----------
Looks like we can't get away with it for the Tcl configure, but for other cases
use the logging redirection for external builds unless a flag is set
specifically to disable it.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/bson.cmake
brlcad/branches/extbuild/src/other/ext/gdal.cmake
brlcad/branches/extbuild/src/other/ext/itcl.cmake
brlcad/branches/extbuild/src/other/ext/itk.cmake
brlcad/branches/extbuild/src/other/ext/iwidgets.cmake
brlcad/branches/extbuild/src/other/ext/netpbm.cmake
brlcad/branches/extbuild/src/other/ext/perplex.cmake
brlcad/branches/extbuild/src/other/ext/png.cmake
brlcad/branches/extbuild/src/other/ext/proj4.cmake
brlcad/branches/extbuild/src/other/ext/regex.cmake
brlcad/branches/extbuild/src/other/ext/stepcode.cmake
brlcad/branches/extbuild/src/other/ext/tcl.cmake
brlcad/branches/extbuild/src/other/ext/tk.cmake
brlcad/branches/extbuild/src/other/ext/zlib.cmake
Modified: brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-12-15
18:18:11 UTC (rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-12-15
19:07:07 UTC (rev 77969)
@@ -148,6 +148,18 @@
set(EXT_BUILD_ALWAYS 0)
endif (NOT DEFINED EXT_BUILD_ALWAYS)
+# The verbosity of the ExtProject stages is controlled by log options - they
+# can either output to the console or to log files. We establish a top level
+# control for this - by default these outputs are logged, but if the verbose
+# flag is set they will be printed to the console during build (useful in
+# scenarios such as CI build runners, where it is advantageous to capture as
+# much output as possible in the top level log.
+if (EXT_BUILD_VERBOSE)
+ set(EXT_BUILD_QUIET OFF)
+else (EXT_BUILD_VERBOSE)
+ set(EXT_BUILD_QUIET ON)
+endif (EXT_BUILD_VERBOSE)
+
# Use this variable to key both CMake messages and tools like rpath_replace
if(NOT DEFINED EXTPROJ_VERBOSE)
set(EXTPROJ_VERBOSE 0)
Modified: brlcad/branches/extbuild/src/other/ext/bson.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -23,6 +23,10 @@
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
# Tell the parent build about files and libraries
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -73,6 +73,10 @@
-DPROJ4_ROOT=${CMAKE_BINARY_ROOT}
-DGDAL_INST_DATA_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/gdal
DEPENDS ${GDAL_DEPS}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/GDAL_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/itcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -114,6 +114,10 @@
-DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_VERSION=${TCL_VERSION}
DEPENDS ${ITCL_DEPS}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/ITCL_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/itk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -83,6 +83,10 @@
-DITCL_ROOT=$<$<BOOL:${ITCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_VERSION=${TCL_VERSION}
DEPENDS ${ITK_DEPS}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/ITK_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/iwidgets.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/iwidgets.cmake 2020-12-15
18:18:11 UTC (rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/iwidgets.cmake 2020-12-15
19:07:07 UTC (rev 77969)
@@ -57,6 +57,10 @@
-DCMAKE_INSTALL_PREFIX=${IWIDGETS_INSTDIR}
-DLIB_DIR=${LIB_DIR}
DEPENDS ${IWIDGETS_DEPS}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/IWIDGETS_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/netpbm.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -31,6 +31,10 @@
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/NETPBM_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/perplex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/perplex.cmake 2020-12-15
18:18:11 UTC (rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/perplex.cmake 2020-12-15
19:07:07 UTC (rev 77969)
@@ -11,6 +11,10 @@
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH} -DDATA_DIR=${DATA_DIR}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/PERPLEX_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -83,6 +83,10 @@
$<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-DPNG_LIB_NAME=${PNG_LIB_NAME} -DPNG_PREFIX=brl_
DEPENDS ${PNG_DEPS}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/PNG_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -50,6 +50,10 @@
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DPROJ_LIB_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/proj
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/PROJ4_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -29,6 +29,10 @@
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DREGEX_PREFIX_STR=libregex_
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/REGEX_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-12-15
18:18:11 UTC (rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-12-15
19:07:07 UTC (rev 77969)
@@ -57,6 +57,10 @@
-DSC_IS_SUBBUILD=ON -DSC_PYTHON_GENERATOR=OFF
-DSC_ENABLE_TESTING=OFF -DSC_ENABLE_COVERAGE=OFF
-DSC_BUILD_SCHEMAS=
DEPENDS ${SC_DEPS}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/STEPCODE_BLD-prefix")
Modified: brlcad/branches/extbuild/src/other/ext/tcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -88,6 +88,10 @@
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${ZLIB_TARGET} tcl_replace rpath_replace
+ # Note - LOG_CONFIGURE doesn't seem to be compatible with complex
CONFIGURE_COMMAND setups
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
set(TCL_APPINIT tclAppInit.c)
@@ -106,6 +110,9 @@
BINARY_DIR ${TCL_SRC_DIR}/win
BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${TCL_INSTDIR} SUFX=
INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${TCL_INSTDIR} SUFX=
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
set(TCL_APPINIT)
Modified: brlcad/branches/extbuild/src/other/ext/tk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -69,6 +69,10 @@
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET} rpath_replace
+ # Note - LOG_CONFIGURE doesn't seem to be compatible with complex
CONFIGURE_COMMAND setups
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
set(TK_APPINIT tkAppInit.c)
@@ -88,6 +92,9 @@
BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${TK_INSTDIR} TCLDIR=${TCL_SRC_DIR} SUFX=
INSTALL_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc install
INSTALLDIR=${TK_INSTDIR} TCLDIR=${TCL_SRC_DIR} SUFX=
DEPENDS ${TCL_TARGET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
set(TK_APPINIT)
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-12-15 18:18:11 UTC
(rev 77968)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-12-15 19:07:07 UTC
(rev 77969)
@@ -33,6 +33,10 @@
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DZ_PREFIX_STR=${Z_PREFIX_STR}
+ LOG_CONFIGURE ${EXT_BUILD_QUIET}
+ LOG_BUILD ${EXT_BUILD_QUIET}
+ LOG_INSTALL ${EXT_BUILD_QUIET}
+ LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/ZLIB_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
