Revision: 77376
http://sourceforge.net/p/brlcad/code/77376
Author: starseeker
Date: 2020-10-09 12:41:17 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Enable proj-4
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 03:30:43 UTC (rev 77375)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-09 12:41:17 UTC (rev 77376)
@@ -174,8 +174,8 @@
# For now, turn everything on:
set(BRLCAD_LEVEL2 ON)
set(BRLCAD_LEVEL3 ON)
+set(BRLCAD_ENABLE_GDAL ON)
-
###############################################################################
# BRL-CAD and some of its dependencies require the lemon, re2c and perplex
# tools for compilation. They are not installed, but must be available. We
@@ -210,10 +210,10 @@
## 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)
#
-## 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)
#
Modified: brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-09 03:30:43 UTC (rev 77375)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-09 12:41:17 UTC (rev 77376)
@@ -22,51 +22,50 @@
set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION})
endif (MSVC)
+ set(PROJ4_INSTDIR ${CMAKE_BINARY_DIR}/proj-4)
+
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_INSTALL_PREFIX}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJ4_INSTDIR} -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
)
# Tell the parent build about files and libraries
- file(APPEND "${SUPERBUILD_OUT}" "
- 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}\"
+ ExternalProject_Target(proj PROJ4_BLD ${PROJ4_INSTDIR}
+ SHARED ${LIB_DIR}/${PROJ_BASENAME}${PROJ_SUFFIX}
+ STATIC ${LIB_DIR}/${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ SYMLINKS
${LIB_DIR}/${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${LIB_DIR}/${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(proj PROJ4_BLD ${PROJ4_INSTDIR} ${DATA_DIR}/proj
${DATA_DIR}/proj
+ epsg
+ esri
+ world
+ esri.extra
+ other.extra
+ IGNF
+ nad27
+ GL27
+ nad83
+ nad.lst
+ proj_def.dat
+ CH
)
- ExternalProject_ByProducts(PROJ4_BLD ${INCLUDE_DIR}/proj
+ ExternalProject_ByProducts(proj PROJ4_BLD ${PROJ4_INSTDIR}
${INCLUDE_DIR}/proj ${INCLUDE_DIR}/proj
projects.h
proj_api.h
geodesic.h
)
- \n")
- list(APPEND BRLCAD_DEPS PROJ4_BLD)
set(PROJ4_LIBRARIES proj CACHE STRING "Building bundled proj" FORCE)
- set(PROJ4_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}/proj" CACHE
STRING "Directory containing proj headers." FORCE)
+ set(PROJ4_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/proj"
CACHE STRING "Directory containing proj headers." FORCE)
SetTargetFolder(PROJ4_BLD "Third Party Libraries")
SetTargetFolder(proj "Third Party Libraries")
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
