From: Regina Obe <lr@pcorp.us>
Date: Sun, 12 Feb 2017 19:31:10 +0000 (+0000)
Subject: forgot pkg_config_path and reverted CGAL version change
X-Git-Tag: 2.4.0alpha~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5545fbdf431db512e9f0866dc887878a60cf49ce;p=postgis

forgot pkg_config_path and reverted CGAL version change
references #3661

git-svn-id: http://svn.osgeo.org/postgis/trunk@15312 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 10475818e..604bcc266 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -97,7 +97,7 @@ fi
 
 if [ -n "$SFCGAL_VER" ]; then
 	##hard code versions of cgal etc. for now
-	export CGAL_VER=4.2
+	export CGAL_VER=4.6.1
 	BOOST_VER=1.53.0
 	#BOOST_VER_WU=1_49_0
 	export BOOST_VER_WU=1_53_0
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 036d7367e..a1fea1239 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -58,6 +58,7 @@ PATH="${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${
 
 #add protobuf
 export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
+export PKG_CONFIG_PATH=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig;
 
 echo PATH AFTER: $PATH