Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Update db stack version options #555

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

WIP: Update db stack version options #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
22c1246
Update versions of all packages in db stack
dstoup Oct 22, 2020
4ebfba1
Remove existing GEOS Patch and setup patch for current version
dstoup Oct 22, 2020
ba75f88
Patch GEOS to remove the doc directory from build
dstoup Oct 22, 2020
37d3691
Fix postgresql v12 md5sum
dstoup Oct 22, 2020
00b6445
Reorganize Postgresql patches for version discrimination
dstoup Oct 23, 2020
10b209c
Set up patch for required defines missing in win32
dstoup Oct 23, 2020
dd70608
Patch win32 config to ensure BLCKSZ and XLOG_BLCKSZ are resonably def…
dstoup Oct 23, 2020
5858b05
Fix psql patch for v12.3. Adapt to file reorganization
dstoup Oct 23, 2020
fe8cfc8
Default PROJ4 to existing version, 4.9.3
dstoup Feb 3, 2021
4233f7f
Copy required headers from source to build directory
dstoup Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions CMake/External_PostgreSQL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ else()
endif()

#Always try the patch, it contains the WIN32 logic
set(_PostgreSQL_PATCH_ARG PATCH_COMMAND
${CMAKE_COMMAND}
-DPostgreSQL_patch:PATH=${fletch_SOURCE_DIR}/Patches/PostgreSQL
set (PostgreSQL_PATCH_DIR ${fletch_SOURCE_DIR}/Patches/PostgreSQL/${PostgreSQL_SELECT_VERSION})
if(EXISTS ${PostgreSQL_PATCH_DIR})
set(PostgreSQL_PATCH_COMMAND ${CMAKE_COMMAND}
-DPostgreSQL_patch:PATH=${PostgreSQL_PATCH_DIR}
-DPostgreSQL_source:PATH=${fletch_BUILD_PREFIX}/src/PostgreSQL
-DPostgreSQL_SELECT_VERSION:STRING=${PostgreSQL_SELECT_VERSION}
-DBUILD_POSTGRESQL_CONTRIB:BOOL=${BUILD_POSTGRESQL_CONTRIB}
-P ${fletch_SOURCE_DIR}/Patches/PostgreSQL/Patch.cmake
-P ${PostgreSQL_PATCH_DIR}/Patch.cmake
)
endif()

ExternalProject_Add(PostgreSQL
URL ${PostgreSQL_url}
URL_MD5 ${PostgreSQL_md5}
${COMMON_EP_ARGS}
${_PostgreSQL_BUILD_IN_SOURCE_ARG}
${_PostgreSQL_PATCH_ARG}
PATCH_COMMAND ${PostgreSQL_PATCH_COMMAND}
${_PostgreSQL_CONFIGURE_ARG}
${_PostgreSQL_BUILD_INSTALL_ARG}
${ARG}
Expand Down
42 changes: 27 additions & 15 deletions CMake/fletch-tarballs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,22 @@ endif()
list(APPEND fletch_external_sources OpenCV)

# PROJ.4
set(PROJ4_version "4.9.3" )
set(PROJ4_url "http://download.osgeo.org/proj/proj-${PROJ4_version}.tar.gz" )
set(PROJ4_md5 "d598336ca834742735137c5674b214a1" )
if (fletch_ENABLE_PROJ4 OR fletch_ENABLE_ALL_PACKAGES)
set(PROJ4_SELECT_VERSION 4.9.3 CACHE STRING "Select the major version of PROJ4 to build.")
set_property(CACHE PROJ4_SELECT_VERSION PROPERTY STRINGS "4.9.3" "6.2.1")
message(STATUS "PROJ4 Select version: ${PROJ4_SELECT_VERSION}")
if (PROJ4_SELECT_VERSION VERSION_EQUAL 4.9.3)
set(PROJ4_version "4.9.3" )
set(PROJ4_url "http://download.osgeo.org/proj/proj-${PROJ4_version}.tar.gz" )
set(PROJ4_md5 "d598336ca834742735137c5674b214a1" )
elseif(PROJ4_SELECT_VERSION VERSION_EQUAL 6.2.1)
set(PROJ4_version "6.1.1" )
set(PROJ4_url "http://download.osgeo.org/proj/proj-${PROJ4_version}.tar.gz" )
set(PROJ4_md5 "9a82a3174cacf319d94360a759fbcc8a" )
else()
message(STATUS "PROJ4_SELECT_VERSION ${PROJ4_SELECT_VERSION}: Not supported")
endif()
endif()
list(APPEND fletch_external_sources PROJ4 )

# libgeotiff
Expand Down Expand Up @@ -372,9 +385,9 @@ endif()
list(APPEND fletch_external_sources GDAL)

# GEOS
set(GEOS_version "3.6.2" )
set(GEOS_version "3.8.1" )
set(GEOS_url "http://download.osgeo.org/geos/geos-${GEOS_version}.tar.bz2" )
set(GEOS_md5 "a32142343c93d3bf151f73db3baa651f" )
set(GEOS_md5 "9d25df02a2c4fcc5a59ac2fb3f0bd977" )
list(APPEND fletch_external_sources GEOS )

# PDAL
Expand All @@ -391,32 +404,31 @@ list(APPEND fletch_external_sources GeographicLib )

# PostgreSQL
if (fletch_ENABLE_PostgreSQL OR fletch_ENABLE_ALL_PACKAGES)
set(PostgreSQL_SELECT_VERSION 9.5.1 CACHE STRING "Select the major version of PostgreSQL to build.")
set_property(CACHE PostgreSQL_SELECT_VERSION PROPERTY STRINGS "9.5.1" "10.2")
set(PostgreSQL_SELECT_VERSION 12.3 CACHE STRING "Select the major version of PostgreSQL to build.")
set_property(CACHE PostgreSQL_SELECT_VERSION PROPERTY STRINGS "9.5.1" "12.3")
message(STATUS "PostgreSQL Select version: ${PostgreSQL_SELECT_VERSION}")

if (PostgreSQL_SELECT_VERSION VERSION_EQUAL 9.5.1)
# PostgreSQL 9.5
set(PostgreSQL_version ${PostgreSQL_SELECT_VERSION})
set(PostgreSQL_url "http://ftp.PostgreSQL.org/pub/source/v${PostgreSQL_version}/postgresql-${PostgreSQL_version}.tar.bz2")
set(PostgreSQL_md5 "11e037afaa4bd0c90bb3c3d955e2b401")
elseif(PostgreSQL_SELECT_VERSION VERSION_EQUAL 10.2)
# PostgreSQL 9.4
elseif(PostgreSQL_SELECT_VERSION VERSION_EQUAL 12.3)
# PostgreSQL 12.3
set(PostgreSQL_version ${PostgreSQL_SELECT_VERSION})
set(PostgreSQL_url "http://ftp.PostgreSQL.org/pub/source/v${PostgreSQL_version}/postgresql-${PostgreSQL_version}.tar.bz2")
set(PostgreSQL_md5 "e97c3cc72bdf661441f29069299b260a")
set(PostgreSQL_md5 "a30c023dd7088e44d73be71af2ef404a")
else()
message(STATUS "PostgreSQL_SELECT_VERSION: Not supported")
endif()
set(PostgreSQL_url "http://ftp.PostgreSQL.org/pub/source/v${PostgreSQL_version}/postgresql-${PostgreSQL_version}.tar.bz2")
endif()
list(APPEND fletch_external_sources PostgreSQL)

# PostGIS
# Currently it seems the this version of PostGIS will work with all provided PostgreSQL versions
if(NOT WIN32)
set(PostGIS_version "2.5.3" )
set(PostGIS_url "http://download.osgeo.org/postgis/source/postgis-${PostGIS_version}.tar.gz" )
set(PostGIS_md5 "475bca6249ee11f675b899de14fd3f42" )
set(PostGIS_version "3.0.1" )
set(PostGIS_url "https://download.osgeo.org/postgis/source/postgis-${PostGIS_version}.tar.gz" )
set(PostGIS_md5 "93f26f162a3961d08caf3b37a3d5fe5d" )
list(APPEND fletch_external_sources PostGIS )
endif()

Expand Down
247 changes: 0 additions & 247 deletions Patches/GEOS/BufferOp.cpp
View file
Open in desktop

This file was deleted.

Loading