Commit d613598e authored by Regina Obe's avatar Regina Obe

Fix versions to be compatible with what SFCGAL was compiled with.

git-svn-id: http://svn.osgeo.org/postgis/trunk@16372 b70326c6-7e19-0410-871a-916f4a2858ee
parent 440c9014
Pipeline #17022215 failed with stage
in 4 minutes and 34 seconds
......@@ -13,18 +13,22 @@ set -e
#POSTGIS_MICRO_VERSION=0SVN
#export GCC_TYPE=gcc48 #for pre-4.8.0 compiles this is blank
#export JSON_VER=0.9
#export SFCGAL_VER=1.0.4
#export SFCGAL_VER=1.3
#export PROJ_VER=4.8.0
#export GEOS_VER=3.7.0dev
#export GDAL_VER=2.2.3
#export PROJ_VER=4.9.3
export GEOS_VER=3.7.0dev
export GDAL_VER=2.2.2
export GDAL_VER=2.2.3
export PROJ_VER=4.9.3
export SFCGAL_VER=1.3
export SFCGAL_VER=1.3.2
export PCRE_VER=8.33
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
export CGAL_VER=4.11
export PROTOBUF_VER=3.2.0
export LIBXML_VER=2.7.8
if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
......@@ -104,8 +108,6 @@ if [ -n "$PCRE_VER" ]; then
fi
if [ -n "$SFCGAL_VER" ]; then
##hard code versions of cgal etc. for now
export CGAL_VER=4.2
BOOST_VER=1.53.0
#BOOST_VER_WU=1_49_0
export BOOST_VER_WU=1_53_0
......
......@@ -13,12 +13,13 @@
#export GCC_TYPE=
export GEOS_VER=3.7.0dev
export GDAL_VER=2.2.2
export GDAL_VER=2.2.3
export PROJ_VER=4.9.3
export SFCGAL_VER=1.3
export SFCGAL_VER=1.3.2
export PCRE_VER=8.33
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
export CGAL_VER=4.11
if [[ "${GCC_TYPE}" == *gcc48* ]] ; then
export PROJECTS=/projects
......@@ -144,7 +145,6 @@ fi;
if [ -n "$SFCGAL_VER" ]; then
## only copy cgal and sfcgal stuff if sfcgal is packaged
export CGAL_VER=4.6.1
export BOOST_VER=1.59.0
export BOOST_VER_WU=1_59_0
export GMP_VER=5.1.2
......
......@@ -9,18 +9,19 @@ set -e
#export POSTGIS_MAJOR_VERSION=2
#export POSTGIS_MINOR_VERSION=2
#export POSTGIS_MICRO_VERSION=0dev
#export GEOS_VER=3.7.0dev
#export GDAL_VER=2.2.2
#export PROJ_VER=4.9.3
#export SFCGAL_VER=1.3
#export PCRE_VER=8.33
#export PROTOBUF_VER=3.2.0
#export PROTOBUFC_VER=1.2.1
#export CGAL_VER=4.11
export PROJECTS=/projects
export MINGPROJECTS=/projects
export PATHOLD=$PATH
export GEOS_VER=3.7.0dev
export GDAL_VER=2.2.2
export PROJ_VER=4.9.3
export SFCGAL_VER=1.3
export PCRE_VER=8.33
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
if [ "$OS_BUILD" == "64" ] ; then
......@@ -93,7 +94,7 @@ fi
if [ -n "$SFCGAL_VER" ]; then
##hard code versions of cgal etc. for now
export CGAL_VER=4.2
#export CGAL_VER=4.11
BOOST_VER=1.53.0
#BOOST_VER_WU=1_49_0
export BOOST_VER_WU=1_53_0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment