Revision: 77254
http://sourceforge.net/p/brlcad/code/77254
Author: starseeker
Date: 2020-09-28 15:02:44 +0000 (Mon, 28 Sep 2020)
Log Message:
-----------
Add a few more superbuild projects
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
Modified: brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-09-28
14:33:26 UTC (rev 77253)
+++ brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-09-28
15:02:44 UTC (rev 77254)
@@ -80,283 +80,17 @@
find_package(GDIAM)
find_package(POLY2TRI)
-###############################################################################
-# libbson - for binary attributes, always use this local version
-###############################################################################
+# For testing set(BRLCAD_ENABLE_BINARY_ATTRIBUTES ON)
+if (BRLCAD_ENABLE_BINARY_ATTRIBUTES)
+ find_package(BSON)
+endif (BRLCAD_ENABLE_BINARY_ATTRIBUTES)
-# For testing
-# set(BRLCAD_ENABLE_BINARY_ATTRIBUTES ON)
+if (BRLCAD_ENABLE_GDAL)
+ find_package(PROJ)
+ find_package(GDAL)
+endif (BRLCAD_ENABLE_GDAL)
-set(libbson_DESCRIPTION "
-Option for enabling and disabling compilation of the Libbson library
-provided with BRL-CAD's source code. Default is BUNDLED, using
-the included other/src version.
-")
-THIRD_PARTY(libbson BSON Libbson libbson_DESCRIPTION ALIASES ENABLE_BSON
REQUIRED_VARS BRLCAD_ENABLE_BINARY_ATTRIBUTES FLAGS NOSYS UNDOCUMENTED)
-
-if (${CMAKE_PROJECT_NAME}_BSON_BUILD)
-
- set(BSON_MAJOR_VERSION 1)
- set(BSON_MINOR_VERSION 3)
- set(BSON_PATCH_VERSION 5)
- set(BSON_VERSION
${BSON_MAJOR_VERSION}.${BSON_MINOR_VERSION}.${BSON_PATCH_VERSION})
-
- ExternalProject_Add(BSON_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libbson"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- )
-
- ExternalProject_Target(bson BSON_BLD
- OUTPUT_FILE libbson-1.0${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_VERSION}
- STATIC_OUTPUT_FILE libbson-1.0${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"libbson-1.0${CMAKE_SHARED_LIBRARY_SUFFIX};libbson-1.0${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION}"
- LINK_TARGET "libbson-1.0${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET "libbson-1.0${CMAKE_STATIC_LIBRARY_SUFFIX}"
- RPATH
- )
- ExternalProject_ByProducts(BSON_BLD ${INCLUDE_DIR}
- libbson-1.0/bson-endian.h
- libbson-1.0/bson-md5.h
- libbson-1.0/bson-value.h
- libbson-1.0/bson-stdint.h
- libbson-1.0/bson-reader.h
- libbson-1.0/bson-context.h
- libbson-1.0/bson-string.h
- libbson-1.0/bson-error.h
- libbson-1.0/bson-macros.h
- libbson-1.0/bson-compat.h
- libbson-1.0/bson-version.h
- libbson-1.0/bson-oid.h
- libbson-1.0/bson-version-functions.h
- libbson-1.0/bson-iter.h
- libbson-1.0/bson-stdint-win32.h
- libbson-1.0/bson-atomic.h
- libbson-1.0/bson-memory.h
- libbson-1.0/bcon.h
- libbson-1.0/bson-json.h
- libbson-1.0/bson-keys.h
- libbson-1.0/bson-utf8.h
- libbson-1.0/bson-types.h
- libbson-1.0/bson.h
- libbson-1.0/bson-writer.h
- libbson-1.0/bson-config.h
- libbson-1.0/bson-clock.h
- )
-
- set(BSON_LIBRARIES utahrle CACHE STRING "Building bundled libbson" FORCE)
- set(BSON_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING
"Directory containing bson headers." FORCE)
-
- SetTargetFolder(BSON_BLD "Third Party Libraries")
- SetTargetFolder(utahrle "Third Party Libraries")
-
-endif (${CMAKE_PROJECT_NAME}_BSON_BUILD)
-
-
###############################################################################
-# PROJ - generic coordinate transformation
-###############################################################################
-
-set(proj4_DESCRIPTION "
-Option for enabling and disabling compilation of the PROJ.4 geographic
-projection library provided with BRL-CAD's source code. Default
-is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
-testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
-")
-THIRD_PARTY(proj-4 PROJ4 proj4 proj4_DESCRIPTION REQUIRED_VARS
"BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2" ALIASES ENABLE_PROJ4)
-
-if (${CMAKE_PROJECT_NAME}_PROJ4_BUILD)
-
- set(PROJ_MAJOR_VERSION 4)
- set(PROJ_MINOR_VERSION 9)
- set(PROJ_API_VERSION 12)
- set(PROJ_VERSION
${PROJ_MAJOR_VERSION}.${PROJ_MINOR_VERSION}.${PROJ_API_VERSION})
-
- ExternalProject_Add(PROJ4_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/proj-4"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- -DPROJ_LIB_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/proj
- )
- ExternalProject_Target(proj PROJ4_BLD
- OUTPUT_FILE libproj${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION}
- STATIC_OUTPUT_FILE libproj${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"libproj${CMAKE_SHARED_LIBRARY_SUFFIX};libproj${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION}"
- LINK_TARGET "libproj${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET "libproj${CMAKE_STATIC_LIBRARY_SUFFIX}"
- RPATH
- )
-
- ExternalProject_ByProducts(PROJ4_BLD ${DATA_DIR}
- proj/epsg
- proj/esri
- proj/world
- proj/esri.extra
- proj/other.extra
- proj/IGNF
- proj/nad27
- proj/GL27
- proj/nad83
- proj/nad.lst
- proj/proj_def.dat
- proj/CH
- )
-
- ExternalProject_ByProducts(PROJ4_BLD ${INCLUDE_DIR}/proj
- projects.h
- proj_api.h
- geodesic.h
- )
-
- set(PROJ4_LIBRARIES proj CACHE STRING "Building bundled proj" FORCE)
- set(PROJ4_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/proj" CACHE
STRING "Directory containing proj headers." FORCE)
-
- SetTargetFolder(PROJ4_BLD "Third Party Libraries")
- SetTargetFolder(proj "Third Party Libraries")
-
-endif (${CMAKE_PROJECT_NAME}_PROJ4_BUILD)
-
-###############################################################################
-# GDAL - translator library for raster and vector geospatial data formats
-###############################################################################
-set(gdal_DESCRIPTION "
-Option for enabling and disabling compilation of the GDAL geographic
-library provided with BRL-CAD's source code. Default
-is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
-testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
-")
-THIRD_PARTY(gdal GDAL gdal gdal_DESCRIPTION REQUIRED_VARS
"BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2" ALIASES ENABLE_GDAL)
-
-if (${CMAKE_PROJECT_NAME}_GDAL_BUILD)
-
- ExternalProject_Add(GDAL_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gdal"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- -DZLIB_ROOT=${CMAKE_BINARY_DIR} -DPNG_ROOT=${CMAKE_BINARY_DIR}
-DPROJ4_ROOT=${CMAKE_BINARY_DIR}
- -DGDAL_INST_DATA_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/gdal
- DEPENDS ${PROJ4_LIBRARIES}
- )
- ExternalProject_Target(gdal GDAL_BLD
- OUTPUT_FILE libgdal${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE libgdal${CMAKE_STATIC_LIBRARY_SUFFIX}
- RPATH
- )
-
- set(GDAL_EXECUTABLES gdalinfo gdallocationinfo gdal_translate gdaltransform
gdaldem gdalwarp gdalbuildvrt)
- foreach(GDALEXEC ${GDAL_EXECUTABLES})
- ExternalProject_Target(${GDALEXEC} GDAL_BLD
- OUTPUT_FILE ${GDALEXEC}${CMAKE_EXECUTABLE_SUFFIX}
- RPATH EXEC
- )
- endforeach(GDALEXEC ${GDAL_EXECUTABLES})
-
- ExternalProject_ByProducts(GDAL_BLD ${DATA_DIR}/gdal
- LICENSE.TXT
- GDALLogoBW.svg
- GDALLogoColor.svg
- GDALLogoGS.svg
- compdcs.csv
- coordinate_axis.csv
- cubewerx_extra.wkt
- datum_shift.csv
- default.rsc
- ecw_cs.wkt
- ellipsoid.csv
- epsg.wkt
- esri_StatePlane_extra.wkt
- esri_Wisconsin_extra.wkt
- esri_extra.wkt
- gcs.csv
- gcs.override.csv
- gdal_datum.csv
- gdalicon.png
- gdalvrt.xsd
- geoccs.csv
- gml_registry.xml
- gmlasconf.xml
- gmlasconf.xsd
- gt_datum.csv
- gt_ellips.csv
- header.dxf
- inspire_cp_BasicPropertyUnit.gfs
- inspire_cp_CadastralBoundary.gfs
- inspire_cp_CadastralParcel.gfs
- inspire_cp_CadastralZoning.gfs
- jpfgdgml_AdmArea.gfs
- jpfgdgml_AdmBdry.gfs
- jpfgdgml_AdmPt.gfs
- jpfgdgml_BldA.gfs
- jpfgdgml_BldL.gfs
- jpfgdgml_Cntr.gfs
- jpfgdgml_CommBdry.gfs
- jpfgdgml_CommPt.gfs
- jpfgdgml_Cstline.gfs
- jpfgdgml_ElevPt.gfs
- jpfgdgml_GCP.gfs
- jpfgdgml_LeveeEdge.gfs
- jpfgdgml_RailCL.gfs
- jpfgdgml_RdASL.gfs
- jpfgdgml_RdArea.gfs
- jpfgdgml_RdCompt.gfs
- jpfgdgml_RdEdg.gfs
- jpfgdgml_RdMgtBdry.gfs
- jpfgdgml_RdSgmtA.gfs
- jpfgdgml_RvrMgtBdry.gfs
- jpfgdgml_SBAPt.gfs
- jpfgdgml_SBArea.gfs
- jpfgdgml_SBBdry.gfs
- jpfgdgml_WA.gfs
- jpfgdgml_WL.gfs
- jpfgdgml_WStrA.gfs
- jpfgdgml_WStrL.gfs
- netcdf_config.xsd
- nitf_spec.xml
- nitf_spec.xsd
- ogrvrt.xsd
- osmconf.ini
- ozi_datum.csv
- ozi_ellips.csv
- pci_datum.txt
- pci_ellips.txt
- pcs.csv
- pcs.override.csv
- plscenesconf.json
- prime_meridian.csv
- projop_wparm.csv
- ruian_vf_ob_v1.gfs
- ruian_vf_st_uvoh_v1.gfs
- ruian_vf_st_v1.gfs
- ruian_vf_v1.gfs
- s57agencies.csv
- s57attributes.csv
- s57expectedinput.csv
- s57objectclasses.csv
- seed_2d.dgn
- seed_3d.dgn
- stateplane.csv
- trailer.dxf
- unit_of_measure.csv
- vdv452.xml
- vdv452.xsd
- vertcs.csv
- vertcs.override.csv
- )
-
- set(GDAL_LIBRARIES gdal CACHE STRING "Building bundled gdal" FORCE)
- set(GDAL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/gdal" CACHE STRING
"Directory containing GDAL headers." FORCE)
-
- SetTargetFolder(GDAL_BLD "Third Party Libraries")
- SetTargetFolder(gdal "Third Party Libraries")
-
-endif (${CMAKE_PROJECT_NAME}_GDAL_BUILD)
-
-###############################################################################
# Tcl/Tk
###############################################################################
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-28 14:33:26 UTC (rev 77253)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-28 15:02:44 UTC (rev 77254)
@@ -166,7 +166,15 @@
# Poly2Tri - 2D constrained Delaunay triangulation
include(${CMAKE_CURRENT_SOURCE_DIR}/poly2tri.cmake)
+# libbson - for binary attributes, always use this local version
+include(${CMAKE_CURRENT_SOURCE_DIR}/bson.cmake)
+# PROJ4 - generic coordinate transformation
+include(${CMAKE_CURRENT_SOURCE_DIR}/proj4.cmake)
+
+# GDAL - translator library for raster and vector geospatial data formats
+include(${CMAKE_CURRENT_SOURCE_DIR}/gdal.cmake)
+
###############################################################################
# Primary BRL-CAD Compilation
###############################################################################
@@ -188,6 +196,9 @@
VDS
GDIAM
POLY2TRI
+ BSON
+ PROJ4
+ GDAL
)
foreach(T ${TARGET_LIST})
if (TARGET ${T}_BLD)
@@ -217,7 +228,9 @@
-DVDS_ROOT=$<$<BOOL:${VDS_TARGET}>:${CMAKE_BINARY_DIR}>
-DGDIAM_ROOT=$<$<BOOL:${GDIAM_TARGET}>:${CMAKE_BINARY_DIR}>
-DPOLY2TRI_ROOT=$<$<BOOL:${POLY2TRI_TARGET}>:${CMAKE_BINARY_DIR}>
- -DBRLCAD_ENABLE_GDAL=OFF
+ -DBSON_ROOT=$<$<BOOL:${BSON_TARGET}>:${CMAKE_BINARY_DIR}>
+ -DPROJ4_ROOT=$<$<BOOL:${PROJ4_TARGET}>:${CMAKE_BINARY_DIR}>
+ -DGDAL_ROOT=$<$<BOOL:${GDAL_TARGET}>:${CMAKE_BINARY_DIR}>
DEPENDS ${BRLCAD_DEPS}
)
Added: brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
(rev 0)
+++ brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake 2020-09-28
15:02:44 UTC (rev 77254)
@@ -0,0 +1,85 @@
+# For testing
+# set(BRLCAD_ENABLE_BINARY_ATTRIBUTES ON)
+set(libbson_DESCRIPTION "
+Option for enabling and disabling compilation of the Libbson library
+provided with BRL-CAD's source code. Default is BUNDLED, using
+the included other/src version.
+")
+THIRD_PARTY(libbson BSON Libbson libbson_DESCRIPTION ALIASES ENABLE_BSON
REQUIRED_VARS BRLCAD_ENABLE_BINARY_ATTRIBUTES FLAGS NOSYS UNDOCUMENTED)
+
+if (${CMAKE_PROJECT_NAME}_BSON_BUILD)
+
+ set(BSON_MAJOR_VERSION 1)
+ set(BSON_MINOR_VERSION 3)
+ set(BSON_PATCH_VERSION 5)
+ set(BSON_VERSION
${BSON_MAJOR_VERSION}.${BSON_MINOR_VERSION}.${BSON_PATCH_VERSION})
+
+ if (MSVC)
+ set(BSON_BASENAME bson-1.0)
+ set(BSON_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else (MSVC)
+ set(BSON_BASENAME libbson-1.0)
+ set(BSON_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_VERSION})
+ endif (MSVC)
+
+ ExternalProject_Add(BSON_BLD
+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/libbson"
+ BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
+ -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+ )
+
+ ExternalProject_Target(bson BSON_BLD
+ OUTPUT_FILE ${BSON_BASENAME}${BSON_SUFFIX}
+ STATIC_OUTPUT_FILE ${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SYMLINKS
"${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION}"
+ LINK_TARGET "${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ STATIC_LINK_TARGET "${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ RPATH
+ )
+ ExternalProject_ByProducts(BSON_BLD ${INCLUDE_DIR}
+ libbson-1.0/bson-endian.h
+ libbson-1.0/bson-md5.h
+ libbson-1.0/bson-value.h
+ libbson-1.0/bson-stdint.h
+ libbson-1.0/bson-reader.h
+ libbson-1.0/bson-context.h
+ libbson-1.0/bson-string.h
+ libbson-1.0/bson-error.h
+ libbson-1.0/bson-macros.h
+ libbson-1.0/bson-compat.h
+ libbson-1.0/bson-version.h
+ libbson-1.0/bson-oid.h
+ libbson-1.0/bson-version-functions.h
+ libbson-1.0/bson-iter.h
+ libbson-1.0/bson-stdint-win32.h
+ libbson-1.0/bson-atomic.h
+ libbson-1.0/bson-memory.h
+ libbson-1.0/bcon.h
+ libbson-1.0/bson-json.h
+ libbson-1.0/bson-keys.h
+ libbson-1.0/bson-utf8.h
+ libbson-1.0/bson-types.h
+ libbson-1.0/bson.h
+ libbson-1.0/bson-writer.h
+ libbson-1.0/bson-config.h
+ libbson-1.0/bson-clock.h
+ )
+
+ list(APPEND BRLCAD_DEPS BSON_BLD)
+
+ set(BSON_LIBRARIES bson CACHE STRING "Building bundled libbson" FORCE)
+ set(BSON_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING
"Directory containing bson headers." FORCE)
+
+ SetTargetFolder(BSON_BLD "Third Party Libraries")
+ SetTargetFolder(bson "Third Party Libraries")
+
+endif (${CMAKE_PROJECT_NAME}_BSON_BUILD)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
Property changes on: brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
(rev 0)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-09-28
15:02:44 UTC (rev 77254)
@@ -0,0 +1,156 @@
+set(gdal_DESCRIPTION "
+Option for enabling and disabling compilation of the GDAL geographic
+library provided with BRL-CAD's source code. Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+")
+THIRD_PARTY(gdal GDAL gdal gdal_DESCRIPTION REQUIRED_VARS
"BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2" ALIASES ENABLE_GDAL)
+
+if (${CMAKE_PROJECT_NAME}_GDAL_BUILD)
+
+ if (MSVC)
+ set(GDAL_BASENAME gdal)
+ else (MSVC)
+ set(GDAL_BASENAME libgdal)
+ endif (MSVC)
+
+ set(TARGET_LIST ZLIB PNG PROJ4)
+ foreach(T ${TARGET_LIST})
+ if (TARGET ${T}_BLD)
+ set(${T}_TARGET ${T}_BLD)
+ endif (TARGET ${T}_BLD)
+ endforeach(T ${TARGET_LIST})
+
+ ExternalProject_Add(GDAL_BLD
+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/gdal"
+ BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
+ -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+ -DZLIB_ROOT=${CMAKE_BINARY_DIR} -DPNG_ROOT=${CMAKE_BINARY_DIR}
-DPROJ4_ROOT=${CMAKE_BINARY_DIR}
+ -DGDAL_INST_DATA_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/gdal
+ DEPENDS ${PROJ4_TARGET} ${PNG_TARGET} ${ZLIB_TARGET}
+ )
+ ExternalProject_Target(gdal GDAL_BLD
+ OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ STATIC_OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ RPATH
+ )
+
+ set(GDAL_EXECUTABLES gdalinfo gdallocationinfo gdal_translate gdaltransform
gdaldem gdalwarp gdalbuildvrt)
+ foreach(GDALEXEC ${GDAL_EXECUTABLES})
+ ExternalProject_Target(${GDALEXEC} GDAL_BLD
+ OUTPUT_FILE ${GDALEXEC}${CMAKE_EXECUTABLE_SUFFIX}
+ RPATH EXEC
+ )
+ endforeach(GDALEXEC ${GDAL_EXECUTABLES})
+
+ ExternalProject_ByProducts(GDAL_BLD ${DATA_DIR}/gdal
+ LICENSE.TXT
+ GDALLogoBW.svg
+ GDALLogoColor.svg
+ GDALLogoGS.svg
+ compdcs.csv
+ coordinate_axis.csv
+ cubewerx_extra.wkt
+ datum_shift.csv
+ default.rsc
+ ecw_cs.wkt
+ ellipsoid.csv
+ epsg.wkt
+ esri_StatePlane_extra.wkt
+ esri_Wisconsin_extra.wkt
+ esri_extra.wkt
+ gcs.csv
+ gcs.override.csv
+ gdal_datum.csv
+ gdalicon.png
+ gdalvrt.xsd
+ geoccs.csv
+ gml_registry.xml
+ gmlasconf.xml
+ gmlasconf.xsd
+ gt_datum.csv
+ gt_ellips.csv
+ header.dxf
+ inspire_cp_BasicPropertyUnit.gfs
+ inspire_cp_CadastralBoundary.gfs
+ inspire_cp_CadastralParcel.gfs
+ inspire_cp_CadastralZoning.gfs
+ jpfgdgml_AdmArea.gfs
+ jpfgdgml_AdmBdry.gfs
+ jpfgdgml_AdmPt.gfs
+ jpfgdgml_BldA.gfs
+ jpfgdgml_BldL.gfs
+ jpfgdgml_Cntr.gfs
+ jpfgdgml_CommBdry.gfs
+ jpfgdgml_CommPt.gfs
+ jpfgdgml_Cstline.gfs
+ jpfgdgml_ElevPt.gfs
+ jpfgdgml_GCP.gfs
+ jpfgdgml_LeveeEdge.gfs
+ jpfgdgml_RailCL.gfs
+ jpfgdgml_RdASL.gfs
+ jpfgdgml_RdArea.gfs
+ jpfgdgml_RdCompt.gfs
+ jpfgdgml_RdEdg.gfs
+ jpfgdgml_RdMgtBdry.gfs
+ jpfgdgml_RdSgmtA.gfs
+ jpfgdgml_RvrMgtBdry.gfs
+ jpfgdgml_SBAPt.gfs
+ jpfgdgml_SBArea.gfs
+ jpfgdgml_SBBdry.gfs
+ jpfgdgml_WA.gfs
+ jpfgdgml_WL.gfs
+ jpfgdgml_WStrA.gfs
+ jpfgdgml_WStrL.gfs
+ netcdf_config.xsd
+ nitf_spec.xml
+ nitf_spec.xsd
+ ogrvrt.xsd
+ osmconf.ini
+ ozi_datum.csv
+ ozi_ellips.csv
+ pci_datum.txt
+ pci_ellips.txt
+ pcs.csv
+ pcs.override.csv
+ plscenesconf.json
+ prime_meridian.csv
+ projop_wparm.csv
+ ruian_vf_ob_v1.gfs
+ ruian_vf_st_uvoh_v1.gfs
+ ruian_vf_st_v1.gfs
+ ruian_vf_v1.gfs
+ s57agencies.csv
+ s57attributes.csv
+ s57expectedinput.csv
+ s57objectclasses.csv
+ seed_2d.dgn
+ seed_3d.dgn
+ stateplane.csv
+ trailer.dxf
+ unit_of_measure.csv
+ vdv452.xml
+ vdv452.xsd
+ vertcs.csv
+ vertcs.override.csv
+ )
+
+ list(APPEND BRLCAD_DEPS GDAL_BLD)
+
+ set(GDAL_LIBRARIES gdal CACHE STRING "Building bundled gdal" FORCE)
+ set(GDAL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/gdal" CACHE STRING
"Directory containing GDAL headers." FORCE)
+
+ SetTargetFolder(GDAL_BLD "Third Party Libraries")
+ SetTargetFolder(gdal "Third Party Libraries")
+
+endif (${CMAKE_PROJECT_NAME}_GDAL_BUILD)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
Property changes on: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
(rev 0)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-09-28 15:02:44 UTC (rev 77254)
@@ -0,0 +1,78 @@
+set(proj4_DESCRIPTION "
+Option for enabling and disabling compilation of the PROJ.4 geographic
+projection library provided with BRL-CAD's source code. Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
+")
+THIRD_PARTY(proj-4 PROJ4 proj4 proj4_DESCRIPTION REQUIRED_VARS
"BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2" ALIASES ENABLE_PROJ4)
+
+if (${CMAKE_PROJECT_NAME}_PROJ4_BUILD)
+
+ set(PROJ_MAJOR_VERSION 4)
+ set(PROJ_MINOR_VERSION 9)
+ set(PROJ_API_VERSION 12)
+ set(PROJ_VERSION
${PROJ_MAJOR_VERSION}.${PROJ_MINOR_VERSION}.${PROJ_API_VERSION})
+
+ if (MSVC)
+ set(PROJ_BASENAME proj)
+ set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else (MSVC)
+ set(PROJ_BASENAME libproj)
+ set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION})
+ endif (MSVC)
+
+ ExternalProject_Add(PROJ4_BLD
+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/proj-4"
+ BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
+ -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+ -DPROJ_LIB_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/proj
+ )
+ ExternalProject_Target(proj PROJ4_BLD
+ OUTPUT_FILE ${PROJ_BASENAME}${PROJ_SUFFIX}
+ STATIC_OUTPUT_FILE ${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SYMLINKS
"${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION}"
+ LINK_TARGET "${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ STATIC_LINK_TARGET "${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ RPATH
+ )
+
+ ExternalProject_ByProducts(PROJ4_BLD ${DATA_DIR}
+ proj/epsg
+ proj/esri
+ proj/world
+ proj/esri.extra
+ proj/other.extra
+ proj/IGNF
+ proj/nad27
+ proj/GL27
+ proj/nad83
+ proj/nad.lst
+ proj/proj_def.dat
+ proj/CH
+ )
+
+ ExternalProject_ByProducts(PROJ4_BLD ${INCLUDE_DIR}/proj
+ projects.h
+ proj_api.h
+ geodesic.h
+ )
+
+ list(APPEND BRLCAD_DEPS PROJ4_BLD)
+
+ set(PROJ4_LIBRARIES proj CACHE STRING "Building bundled proj" FORCE)
+ set(PROJ4_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/proj" CACHE
STRING "Directory containing proj headers." FORCE)
+
+ SetTargetFolder(PROJ4_BLD "Third Party Libraries")
+ SetTargetFolder(proj "Third Party Libraries")
+
+endif (${CMAKE_PROJECT_NAME}_PROJ4_BUILD)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
Property changes on:
brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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
