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 10475818e824359e86f2545c6ca0c8b35d17aa0c..604bcc26671e75fb61d093afac9843f1b73429fb 100644 (file)
--- 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 036d7367e6a77a7fe1755d430d7d26920cc5cd21..a1fea12394b7e5f1ceaef180642062e321277305 100644 (file)
--- 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