ENH: superbuild: use geos-config for GDAL

SuperBuild/CMake/External_gdal.cmake

@@ -25,11 +25,15 @@ else()
   ADD_SUPERBUILD_CONFIGURE_VAR(JPEG_SB_ROOT     --with-jpeg)
   ADD_SUPERBUILD_CONFIGURE_VAR(OPENJPEG_SB_ROOT --with-openjpeg)
   ADD_SUPERBUILD_CONFIGURE_VAR(SQLITE_SB_ROOT   --with-sqlite3)
-  ADD_SUPERBUILD_CONFIGURE_VAR(GEOS_SB_ROOT     --with-geos)
   ADD_SUPERBUILD_CONFIGURE_VAR(ZLIB_SB_ROOT     --with-libz)
   ADD_SUPERBUILD_CONFIGURE_VAR(EXPAT_SB_ROOT    --with-expat)
   ADD_SUPERBUILD_CONFIGURE_VAR(LIBKML_SB_ROOT   --with-libkml)
   ADD_SUPERBUILD_CONFIGURE_VAR(CURL_SB_ROOT     --with-curl)
+  if(MSVC)
+    ADD_SUPERBUILD_CONFIGURE_VAR(GEOS_SB_ROOT     --with-geos)
+  else()
+    ADD_SUPERBUILD_CONFIGURE_VAR(GEOS_SB_ROOT     --with-geos "/bin/geos-config")
+  endif()
   
   #if(USE_SYSTEM_TIFF)
   #  if(NOT SYSTEM_TIFF_PREFIX STREQUAL "")

SuperBuild/CMake/SuperBuild_Macro.cmake

@@ -87,14 +87,16 @@ macro(ADD_SUPERBUILD_CMAKE_VAR var)
 endmacro(ADD_SUPERBUILD_CMAKE_VAR)
 
 # Macro to add a configure variable to ${proj}_SB_CONFIG
+# optional 3rd argument : suffix to the variable
 macro(ADD_SUPERBUILD_CONFIGURE_VAR var name)
+  set(suffix "${ARGV2}")
   if(DEFINED _SB_${var})
     list(APPEND ${proj}_SB_CONFIG
-      ${name}=${_SB_${var}}
+      ${name}=${_SB_${var}}${suffix}
       )
   elseif(DEFINED ${var})
     list(APPEND ${proj}_SB_CONFIG
-      ${name}=${${var}}
+      ${name}=${${var}}${suffix}
       )
   endif()
 endmacro(ADD_SUPERBUILD_CONFIGURE_VAR)