Revision: 77715
http://sourceforge.net/p/brlcad/code/77715
Author: starseeker
Date: 2020-11-10 13:55:19 +0000 (Tue, 10 Nov 2020)
Log Message:
-----------
Pass build type for other ext builds.
Modified Paths:
--------------
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/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/zlib.cmake
Modified: brlcad/branches/extbuild/src/other/ext/bson.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -41,6 +41,7 @@
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bson"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${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-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -53,6 +53,7 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${GDAL_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DZLIB_ROOT=${CMAKE_BINARY_ROOT}
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${ZLIB_LIBRARY}>
-DPNG_ROOT=${CMAKE_BINARY_ROOT}
Modified: brlcad/branches/extbuild/src/other/ext/itcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -91,6 +91,7 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${ITCL_INSTDIR}
+
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DBIN_DIR=${BIN_DIR}
-DLIB_DIR=${LIB_DIR}
-DSHARED_DIR=${SHARED_DIR}
Modified: brlcad/branches/extbuild/src/other/ext/itk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -75,6 +75,7 @@
-DSHARED_DIR=${SHARED_DIR}
-DINCLUDE_DIR=${INCLUDE_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
+
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
-DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DITCL_ROOT=$<$<BOOL:${ITCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_VERSION=${TCL_VERSION}
Modified: brlcad/branches/extbuild/src/other/ext/netpbm.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -28,6 +28,7 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${NETPBM_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+
$<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
)
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-11-10
13:50:46 UTC (rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/perplex.cmake 2020-11-10
13:55:19 UTC (rev 77715)
@@ -7,6 +7,7 @@
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/perplex"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${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_INSTALL_RPATH=${CMAKE_BUILD_RPATH} -DDATA_DIR=${DATA_DIR}
)
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -65,6 +65,7 @@
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/png"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${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_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DSKIP_INSTALL_EXPORT=ON
-DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_EXECUTABLES=ON
-DSKIP_INSTALL_FILES=ON
-DSKIP_INSTALL_EXPORT=ON -DPNG_TESTS=OFF -Dld-version-script=OFF
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -42,6 +42,7 @@
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/proj-4"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${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_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DPROJ_LIB_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/proj
)
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -43,6 +43,7 @@
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/regex"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${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_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DREGEX_PREFIX_STR=libregex_
)
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-10 13:50:46 UTC
(rev 77714)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-10 13:55:19 UTC
(rev 77715)
@@ -46,6 +46,7 @@
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${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_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DZ_PREFIX_STR=${Z_PREFIX_STR}
)
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
