]> granicus.if.org Git - postgis/commitdiff
Add sfcgal to path
authorRegina Obe <lr@pcorp.us>
Sun, 14 Apr 2019 02:05:18 +0000 (02:05 +0000)
committerRegina Obe <lr@pcorp.us>
Sun, 14 Apr 2019 02:05:18 +0000 (02:05 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@17391 b70326c6-7e19-0410-871a-916f4a2858ee

ci/debbie/postgis_regress.sh

index 8170f416a74c36ffc3737ec937ce421039afcfa7..d89d4b843df71ec43b63401b774b50331849c25e 100644 (file)
@@ -23,7 +23,7 @@ PROJECTS=${JENKINS_HOME}/workspace
 PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
 
 export PGUSER=postgres
-export PATH="${PGPATH}/bin:$PATH"
+export PATH="${PGPATH}/bin:${PROJECTS}/sfcgal/rel-${SFCGAL_VER}w${OS_BUILD}/bin:$PATH"
 export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PROJECTS}/sfcgal/rel-${SFCGAL_VER}w${OS_BUILD}/lib:${PGPATH}/lib"
 
 rm -rf ${WORKSPACE}/tmp/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
@@ -64,7 +64,7 @@ fi
     --with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config \
     --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config \
     --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config \
-    --with-sfcgal=/var/lib/jenkins/workspace/sfcgal/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}/bin/sfcgal-config --without-interrupt-tests \
+    --with-sfcgal=${PROJECTS}/sfcgal/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}/bin/sfcgal-config --without-interrupt-tests \
     --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}
 make clean
 make