From b0041af8c27bf3c841cebee7e2539503b8cac1bc Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Mon, 1 Jul 2019 03:37:02 +0000
Subject: [PATCH] optional cgal version

git-svn-id: http://svn.osgeo.org/postgis/trunk@17571 b70326c6-7e19-0410-871a-916f4a2858ee
---
 ci/winnie/build_postgis.sh   |  6 ++++++
 ci/winnie/package_postgis.sh |  8 ++++++--
 ci/winnie/regress_postgis.sh | 10 ++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 029520505..67c549cf2 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -36,12 +36,18 @@ if  [[ "${LIBXML_VER}" == '' ]] ; then
   export LIBXML_VER=2.7.8
 fi;
 
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
+
 #export GDAL_VER=2.4.0
 #export PROJ_VER=5.2.0
 
 echo "ZLIB_VER $ZLIB_VER"
 echo "PROJ_VER $PROJ_VER"
 echo "LIBXML_VER $LIBXML_VER"
+echo "CGAL_VER $CGAL_VER"
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index b55297bfd..16f3daa19 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -53,12 +53,16 @@ if  [[ "${LIBXML_VER}" == '' ]] ; then
   export LIBXML_VER=2.7.8
 fi;
 
-#export GDAL_VER=2.4.0
-#export PROJ_VER=5.2.0
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
 
 echo "ZLIB_VER $ZLIB_VER"
 echo "PROJ_VER $PROJ_VER"
 echo "LIBXML_VER $LIBXML_VER"
+echo "CGAL_VER $CGAL_VER"
+
 export PROJECTS=/projects
 export MINGPROJECTS=/projects
 export PATHOLD=$PATH
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index bc09fa4f7..9b3c190a5 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -36,9 +36,15 @@ if  [[ "${LIBXML_VER}" == '' ]] ; then
   export LIBXML_VER=2.7.8
 fi;
 
-#export GDAL_VER=2.4.0
-#export PROJ_VER=5.2.0
+#set to something even if override is on but not set
+if  [[ "${CGAL_VER}" == '' ]] ; then
+  export CGAL_VER=4.11
+fi;
 
+echo "ZLIB_VER $ZLIB_VER"
+echo "PROJ_VER $PROJ_VER"
+echo "LIBXML_VER $LIBXML_VER"
+echo "CGAL_VER $CGAL_VER"
 echo "ZLIB_VER $ZLIB_VER"
 echo "PROJ_VER $PROJ_VER"
 echo "LIBXML_VER $LIBXML_VER"
-- 
2.40.0