Revision: 77761
http://sourceforge.net/p/brlcad/code/77761
Author: starseeker
Date: 2020-11-20 18:37:45 +0000 (Fri, 20 Nov 2020)
Log Message:
-----------
Adjust this variable name to better match the ExternalProject option it
controls.
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-11-20
18:19:04 UTC (rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-11-20
18:37:45 UTC (rev 77761)
@@ -145,9 +145,9 @@
# this to 1 changes that, but at the expense of running the build step every
# time. This may be fast if there is nothing to update in the project, but it
# will be slower than skipping the step completely.
-if (NOT DEFINED EXTERNAL_BUILD_UPDATE)
- set(EXTERNAL_BUILD_UPDATE 0)
-endif (NOT DEFINED EXTERNAL_BUILD_UPDATE)
+if (NOT DEFINED EXT_BUILD_ALWAYS)
+ set(EXT_BUILD_ALWAYS 0)
+endif (NOT DEFINED EXT_BUILD_ALWAYS)
# Use this variable to key both CMake messages and tools like rpath_replace
if(NOT DEFINED EXTPROJ_VERBOSE)
Modified: brlcad/branches/extbuild/src/other/ext/bson.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -39,7 +39,7 @@
ExternalProject_Add(BSON_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bson"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
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}
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -50,7 +50,7 @@
ExternalProject_Add(GDAL_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gdal"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${GDAL_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
Modified: brlcad/branches/extbuild/src/other/ext/itcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -88,7 +88,7 @@
ExternalProject_Add(ITCL_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/itcl3"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${ITCL_INSTDIR}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
Modified: brlcad/branches/extbuild/src/other/ext/itk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -67,7 +67,7 @@
ExternalProject_Add(ITK_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/itk3"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${ITK_INSTDIR}
-DBIN_DIR=${BIN_DIR}
Modified: brlcad/branches/extbuild/src/other/ext/iwidgets.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/iwidgets.cmake 2020-11-20
18:19:04 UTC (rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/iwidgets.cmake 2020-11-20
18:37:45 UTC (rev 77761)
@@ -52,7 +52,7 @@
ExternalProject_Add(IWIDGETS_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/iwidgets"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${IWIDGETS_INSTDIR}
-DLIB_DIR=${LIB_DIR}
Modified: brlcad/branches/extbuild/src/other/ext/netpbm.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -25,7 +25,7 @@
ExternalProject_Add(NETPBM_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/netpbm"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${NETPBM_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
Modified: brlcad/branches/extbuild/src/other/ext/perplex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/perplex.cmake 2020-11-20
18:19:04 UTC (rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/perplex.cmake 2020-11-20
18:37:45 UTC (rev 77761)
@@ -5,7 +5,7 @@
ExternalProject_Add(PERPLEX_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/perplex"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PERPLEX_BLD_ROOT} -DBIN_DIR=${BIN_DIR}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -63,7 +63,7 @@
ExternalProject_Add(PNG_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/png"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PNG_INSTDIR}
-DCMAKE_INSTALL_LIBDIR=${LIB_DIR}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -40,7 +40,7 @@
ExternalProject_Add(PROJ4_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/proj-4"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJ4_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -41,7 +41,7 @@
# issue by renaming our libregex symbols to be incompatible with libc.
ExternalProject_Add(REGEX_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/regex"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${REGEX_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-20
18:19:04 UTC (rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-20
18:37:45 UTC (rev 77761)
@@ -39,7 +39,7 @@
ExternalProject_Add(STEPCODE_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/stepcode"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STEPCODE_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
Modified: brlcad/branches/extbuild/src/other/ext/tcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -74,7 +74,7 @@
ExternalProject_Add(TCL_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/tcl"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
PATCH_COMMAND rpath_replace ${TCL_PATCH_FILES}
COMMAND tcl_replace ${TCL_REWORK_FILES}
CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${TCL_SRC_DIR}/unix/configure
--prefix=${TCL_INSTDIR}
@@ -93,7 +93,7 @@
ExternalProject_Add(TCL_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/tcl"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CONFIGURE_COMMAND ""
BINARY_DIR ${TCL_SRC_DIR}/win
BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${TCL_INSTDIR} SUFX=
Modified: brlcad/branches/extbuild/src/other/ext/tk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/tk.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -55,7 +55,7 @@
ExternalProject_Add(TK_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/tk"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
PATCH_COMMAND rpath_replace ${TK_PATCH_FILES}
CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${TK_SRC_DIR}/unix/configure
--prefix=${TK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TCLCONF_DIR}>
--disable-xft --enable-64bit --enable-rpath
BUILD_COMMAND make -j${pcnt}
@@ -73,7 +73,7 @@
ExternalProject_Add(TK_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/tk"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CONFIGURE_COMMAND ""
BINARY_DIR ${TK_SRC_DIR}/win
BUILD_COMMAND ${VCVARS_BAT} && nmake -f makefile.vc
INSTALLDIR=${TK_INSTDIR} TCLDIR=${TCL_SRC_DIR} SUFX=
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-20 18:19:04 UTC
(rev 77760)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-20 18:37:45 UTC
(rev 77761)
@@ -44,7 +44,7 @@
ExternalProject_Add(ZLIB_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${ZLIB_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DCMAKE_SKIP_BUILD_RPATH=${CMAKE_SKIP_BUILD_RPATH}
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
