From d973cf0e4abbf1b9daca284cc4e0d62748e74c5f Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 20 Mar 2015 10:24:31 +0100
Subject: [PATCH] ENH: make sure the selected gdal is tested
---
Modules/ThirdParty/GDAL/gdalTest.sh.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Modules/ThirdParty/GDAL/gdalTest.sh.in b/Modules/ThirdParty/GDAL/gdalTest.sh.in
index 2c1d173e5f..6341d37086 100644
--- a/Modules/ThirdParty/GDAL/gdalTest.sh.in
+++ b/Modules/ThirdParty/GDAL/gdalTest.sh.in
@@ -4,9 +4,10 @@ tempFolder=@TEMP@
gdalLibLocation=@GDAL_LIBRARY@
sourceDir=@CMAKE_SOURCE_DIR@
apple=@APPLE@
+gdalConfig=@GDAL_CONFIG@
+gdalTranslate=`dirname ${gdalConfig}`/gdal_translate
#TEST 1 : GDAL version
-gdalConfig="$(which gdal-config)"
${gdalConfig} --version > ${tempFolder}/testgdal1.txt
#TEST 2 : dyn. symbols
@@ -18,7 +19,7 @@ nm -U ${gdalLibLocation} | grep TIFFClose > ${tempFolder}/testgdal2.txt # -U : d
fi
#TEST 3 : Big tiff
-gdal_translate -co "BIGTIFF=YES" ${sourceDir}/Modules/ThirdParty/GDAL/logoVectoriel.png ${tempFolder}/logoVectoriel.tif > ${tempFolder}/testgdal3.txt
+${gdalTranslate} -co "BIGTIFF=YES" ${sourceDir}/Modules/ThirdParty/GDAL/logoVectoriel.png ${tempFolder}/logoVectoriel.tif > ${tempFolder}/testgdal3.txt
#TEST 4 : GDAL formats
${gdalConfig} --formats > ${tempFolder}/testgdal4.txt
--
GitLab