[postgis-tickets] r15312 - forgot pkg_config_path and reverted CGAL version change

[Regina Obe]

Author: robe
Date: 2017-02-12 11:31:10 -0800 (Sun, 12 Feb 2017)
New Revision: 15312

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
forgot pkg_config_path and reverted CGAL version change
references #3661

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2017-02-12 19:15:57 UTC (rev 15311)
+++ trunk/ci/winnie/build_postgis.sh	2017-02-12 19:31:10 UTC (rev 15312)
@@ -97,7 +97,7 @@
 
 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

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2017-02-12 19:15:57 UTC (rev 15311)
+++ trunk/ci/winnie/regress_postgis.sh	2017-02-12 19:31:10 UTC (rev 15312)
@@ -58,6 +58,7 @@
 
 #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