Revision: 77377
http://sourceforge.net/p/brlcad/code/77377
Author: starseeker
Date: 2020-10-09 12:55:20 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Start working on gdal
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 12:41:17 UTC (rev 77376)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 12:55:20 UTC (rev 77377)
@@ -213,10 +213,10 @@
# 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)
-#
+
+# GDAL - translator library for raster and vector geospatial data formats
+include(${CMAKE_CURRENT_SOURCE_DIR}/gdal.cmake)
+
## TCL - scripting language
#include(${CMAKE_CURRENT_SOURCE_DIR}/tcl.cmake)
#include(${CMAKE_CURRENT_SOURCE_DIR}/tk.cmake)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-09
12:41:17 UTC (rev 77376)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-09
12:55:20 UTC (rev 77377)
@@ -15,38 +15,42 @@
set(GDAL_BASENAME libgdal)
endif (MSVC)
- set(TARGET_LIST ZLIB PNG PROJ4)
+ set(GDAL_DEPS)
+ set(TARGET_LIST zlib png proj)
foreach(T ${TARGET_LIST})
- if (TARGET ${T}_BLD)
- set(${T}_TARGET ${T}_BLD)
- endif (TARGET ${T}_BLD)
+ if (TARGET ${T}_stage)
+ list(APPEND GDAL_DEPS ${T}_stage)
+ endif (TARGET ${T}_stage)
endforeach(T ${TARGET_LIST})
+ set(GDAL_INSTDIR ${CMAKE_BINARY_DIR}/gdal)
+
ExternalProject_Add(GDAL_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gdal"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
+ 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}
- -DZLIB_ROOT=${CMAKE_INSTALL_PREFIX} -DPNG_ROOT=${CMAKE_INSTALL_PREFIX}
-DPROJ4_ROOT=${CMAKE_INSTALL_PREFIX}
+ -DZLIB_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
+ -DPNG_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
+ -DPROJ4_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
-DGDAL_INST_DATA_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/gdal
- DEPENDS ${PROJ4_TARGET} ${PNG_TARGET} ${ZLIB_TARGET}
+ DEPENDS ${GDAL_DEPS}
)
# Tell the parent build about files and libraries
- file(APPEND "${SUPERBUILD_OUT}" "
- ExternalProject_Target(gdal GDAL_BLD
- OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ ExternalProject_Target(gdal GDAL_BLD ${GDAL_INSTDIR}
+ SHARED ${LIB_DIR}/${GDAL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ STATIC ${LIB_DIR}/${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
+ ExternalProject_Target(${GDALEXEC}_exe GDAL_BLD ${GDAL_INSTDIR}
+ EXEC ${GDALEXEC}${CMAKE_EXECUTABLE_SUFFIX}
+ RPATH
)
endforeach(GDALEXEC ${GDAL_EXECUTABLES})
- ExternalProject_ByProducts(GDAL_BLD ${DATA_DIR}/gdal
+ ExternalProject_ByProducts(gdal GDAL_BLD ${GDAL_INSTDIR} ${DATA_DIR}/gdal
${DATA_DIR}/gdal
LICENSE.TXT
GDALLogoBW.svg
GDALLogoColor.svg
@@ -137,12 +141,9 @@
vertcs.csv
vertcs.override.csv
)
- \n")
- list(APPEND BRLCAD_DEPS GDAL_BLD)
-
set(GDAL_LIBRARIES gdal CACHE STRING "Building bundled gdal" FORCE)
- set(GDAL_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}/gdal" CACHE
STRING "Directory containing GDAL headers." FORCE)
+ set(GDAL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/gdal"
CACHE STRING "Directory containing GDAL headers." FORCE)
SetTargetFolder(GDAL_BLD "Third Party Libraries")
SetTargetFolder(gdal "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-09 12:41:17 UTC (rev 77376)
+++ brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-09 12:55:20 UTC (rev 77377)
@@ -59,7 +59,7 @@
endforeach(SCLIB ${STEPCODE_LIBS})
set(STEPCODE_EXECS check-express exppp exp2cxx)
foreach(SCEXEC ${STEPCODE_EXECS})
- ExternalProject_Target(${SCEXEC}_exe STEPCODE_BLD
+ ExternalProject_Target(${SCEXEC}_exe STEPCODE_BLD ${STEPCODE_INSTDIR}
EXEC ${BIN_DIR}/${SCEXEC}${CMAKE_EXECUTABLE_SUFFIX}
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
