Revision: 77635
http://sourceforge.net/p/brlcad/code/77635
Author: starseeker
Date: 2020-10-24 13:52:56 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
Need some adjustments for static libs
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/bson.cmake
brlcad/branches/extbuild/src/other/ext/gdal.cmake
brlcad/branches/extbuild/src/other/ext/itk.cmake
brlcad/branches/extbuild/src/other/ext/netpbm.cmake
brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt
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/zlib.cmake
Modified: brlcad/branches/extbuild/src/other/ext/bson.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -43,9 +43,11 @@
RPATH
)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/BSON_BLD-prefix")
- ExternalProject_Target(STATIC bson-static BSON_BLD
- ${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
+ if (BUILD_STATIC_LIBS)
+ ExternalProject_Target(STATIC bson-static BSON_BLD
+ ${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ endif (BUILD_STATIC_LIBS)
ExternalProject_ByProducts(bson BSON_BLD ${BSON_INSTDIR} ${INCLUDE_DIR}
libbson-1.0/bson-endian.h
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -67,9 +67,11 @@
${GDAL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_Target(STATIC gdal-static GDAL_BLD ${GDAL_INSTDIR}
- ${GDAL_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
+ if (BUILD_STATIC_LIBS)
+ ExternalProject_Target(STATIC gdal-static GDAL_BLD ${GDAL_INSTDIR}
+ ${GDAL_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ endif (BUILD_STATIC_LIBS)
set(GDAL_EXECUTABLES gdalinfo gdallocationinfo gdal_translate gdaltransform
gdaldem gdalwarp gdalbuildvrt)
foreach(GDALEXEC ${GDAL_EXECUTABLES})
Modified: brlcad/branches/extbuild/src/other/ext/itk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -75,7 +75,6 @@
-DSHARED_DIR=${SHARED_DIR}
-DINCLUDE_DIR=${INCLUDE_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
- -DBUILD_STATIC_LIBS_STATIC=${BUILD_STATIC_LIBS}
-DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DITCL_ROOT=$<$<BOOL:${ITCL_TARGET}>:${CMAKE_BINARY_ROOT}>
-DTCL_VERSION=${TCL_VERSION}
@@ -86,10 +85,8 @@
if (NOT MSVC)
set(ITK_BASENAME libitk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
- set(ITK_STUBNAME libitkstub)
else (NOT MSVC)
set(ITK_BASENAME itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
- set(ITK_STUBNAME itkstub)
endif (NOT MSVC)
# Tell the parent build about files and libraries
Modified: brlcad/branches/extbuild/src/other/ext/netpbm.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -35,9 +35,11 @@
${NETPBM_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_Target(STATIC netpbm-static NETPBM_BLD ${NETPBM_INSTDIR}
- ${NETPBM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
+ if (BUILD_STATIC_LIBS)
+ ExternalProject_Target(STATIC netpbm-static NETPBM_BLD ${NETPBM_INSTDIR}
+ ${NETPBM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ endif (BUILD_STATIC_LIBS)
ExternalProject_ByProducts(netpbm NETPBM_BLD ${NETPBM_INSTDIR}
${INCLUDE_DIR}/netpbm
bitio.h
Modified: brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt 2020-10-24
13:44:01 UTC (rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/png/CMakeLists.txt 2020-10-24
13:52:56 UTC (rev 77635)
@@ -56,7 +56,7 @@
# COMMAND LINE OPTIONS
option(PNG_SHARED "Build shared lib" ON)
-option(PNG_STATIC "Build static lib" ON)
+option(PNG_STATIC "Build static lib" ${BUILD_STATIC_LIBS})
option(PNG_TESTS "Build libpng tests" ON)
# Many more configuration options could be added here
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -73,9 +73,11 @@
LINK_TARGET ${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_Target(STATIC png-static PNG_BLD ${PNG_INSTDIR}
- ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
+ if (BUILD_STATIC_LIBS)
+ ExternalProject_Target(STATIC png-static PNG_BLD ${PNG_INSTDIR}
+ ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ endif (BUILD_STATIC_LIBS)
ExternalProject_ByProducts(png PNG_BLD ${PNG_INSTDIR} ${INCLUDE_DIR}
png.h
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -46,9 +46,11 @@
LINK_TARGET ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_Target(STATIC proj-static PROJ4_BLD ${PROJ4_INSTDIR}
- ${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
+ if (BUILD_STATIC_LIBS)
+ ExternalProject_Target(STATIC proj-static PROJ4_BLD ${PROJ4_INSTDIR}
+ ${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ endif (BUILD_STATIC_LIBS)
ExternalProject_ByProducts(proj PROJ4_BLD ${PROJ4_INSTDIR} ${DATA_DIR}/proj
epsg
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -44,10 +44,12 @@
LINK_TARGET ${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
- ExternalProject_Target(STATIC regex-static REGEX_BLD ${REGEX_INSTDIR}
- ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- RPATH
- )
+ if (BUILD_STATIC_LIBS)
+ ExternalProject_Target(STATIC regex-static REGEX_BLD ${REGEX_INSTDIR}
+ ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ RPATH
+ )
+ endif (BUILD_STATIC_LIBS)
ExternalProject_ByProducts(regex REGEX_BLD ${REGEX_INSTDIR} ${INCLUDE_DIR}
regex.h
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-10-24
13:44:01 UTC (rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-10-24
13:52:56 UTC (rev 77635)
@@ -38,7 +38,7 @@
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/stepcode"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STEPCODE_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+ -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=OFF
-DLEMON_ROOT=${CMAKE_BINARY_ROOT}
-DRE2C_ROOT=${CMAKE_BINARY_ROOT}
-DPERPLEX_ROOT=${CMAKE_BINARY_ROOT}
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-10-24 13:44:01 UTC
(rev 77634)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-10-24 13:52:56 UTC
(rev 77635)
@@ -47,10 +47,12 @@
LINK_TARGET "${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
RPATH
)
- ExternalProject_Target(STATIC zlib-static ZLIB_BLD ${ZLIB_INSTDIR}
- ${ZLIB_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- )
-
+ if (BUILD_STATIC_LIBS)
+ ExternalProject_Target(STATIC zlib-static ZLIB_BLD ${ZLIB_INSTDIR}
+ ${ZLIB_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+ endif (BUILD_STATIC_LIBS)
+
ExternalProject_ByProducts(zlib ZLIB_BLD ${ZLIB_INSTDIR} ${INCLUDE_DIR}
zconf.h
zlib.h
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
