From 2071cb02e57a97bcb9fbbffb7b6968f6e3a4a9e4 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Tue, 25 Jul 2017 17:12:25 +0200
Subject: [PATCH] SuperBuild: GDAL: use existing SB_INSTALL_PREFIX_NATIVE
---
SuperBuild/CMake/External_gdal.cmake | 2 -
.../patches/GDAL/nmake_gdal_extra.opt.in | 40 ++++++++++---------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/SuperBuild/CMake/External_gdal.cmake b/SuperBuild/CMake/External_gdal.cmake
index 958624d5c2..c5ab346865 100644
--- a/SuperBuild/CMake/External_gdal.cmake
+++ b/SuperBuild/CMake/External_gdal.cmake
@@ -107,8 +107,6 @@ if(UNIX)
#set(GDAL_INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install)
else(MSVC)
- STRING(REGEX REPLACE "/$" "" CMAKE_WIN_INSTALL_PREFIX ${SB_INSTALL_PREFIX})
- STRING(REGEX REPLACE "/" "\\\\" CMAKE_WIN_INSTALL_PREFIX ${CMAKE_WIN_INSTALL_PREFIX})
configure_file(
${CMAKE_SOURCE_DIR}/patches/GDAL/nmake_gdal_extra.opt.in
${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt)
diff --git a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
index 59bfa9b8ad..c1b5e57e09 100644
--- a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
+++ b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
@@ -11,51 +11,51 @@ JPEG_SUPPORTED = 1
# This will enable 12bit libjpeg - use only with internal jpeg builds.
#JPEG12_SUPPORTED = 1
-GDAL_HOME="@CMAKE_WIN_INSTALL_PREFIX@"
+GDAL_HOME="@SB_INSTALL_PREFIX_NATIVE@"
#if using an external jpeg library uncomment the follwing lines
JPEG_EXTERNAL_LIB = 1
-JPEGDIR = @CMAKE_WIN_INSTALL_PREFIX@\include
-JPEG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\jpeg.lib
+JPEGDIR = @SB_INSTALL_PREFIX_NATIVE@\include
+JPEG_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\jpeg.lib
#if using an external png library uncomment the follwing lines
PNG_EXTERNAL_LIB = 1
-PNGDIR = @CMAKE_WIN_INSTALL_PREFIX@\include
-PNG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\libpng.lib
+PNGDIR = @SB_INSTALL_PREFIX_NATIVE@\include
+PNG_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\libpng.lib
# if using an external libtiff library
-TIFF_INC = -I@CMAKE_WIN_INSTALL_PREFIX@\include
-TIFF_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\tiff.lib
+TIFF_INC = -I@SB_INSTALL_PREFIX_NATIVE@\include
+TIFF_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\tiff.lib
# uncomment following line, if you have libtiff version >= 4.0 to enable BigTIFF support
TIFF_OPTS= -DBIGTIFF_SUPPORT
# if using an external libgeotiff library
-GEOTIFF_INC = -I@CMAKE_WIN_INSTALL_PREFIX@\include
-GEOTIFF_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\geotiff_i.lib
+GEOTIFF_INC = -I@SB_INSTALL_PREFIX_NATIVE@\include
+GEOTIFF_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\geotiff_i.lib
-EXPAT_DIR = @CMAKE_WIN_INSTALL_PREFIX@
+EXPAT_DIR = @SB_INSTALL_PREFIX_NATIVE@
EXPAT_INCLUDE = -I$(EXPAT_DIR)\include
EXPAT_LIB = $(EXPAT_DIR)\lib\expat.lib
# SQLite Libraries
-SQLITE_INC=-I@CMAKE_WIN_INSTALL_PREFIX@\include
-SQLITE_LIB=@CMAKE_WIN_INSTALL_PREFIX@\lib\sqlite3.lib
+SQLITE_INC=-I@SB_INSTALL_PREFIX_NATIVE@\include
+SQLITE_LIB=@SB_INSTALL_PREFIX_NATIVE@\lib\sqlite3.lib
# Uncomment following line if libsqlite3 has been compiled with SQLITE_HAS_COLUMN_METADATA=yes
SQLITE_HAS_COLUMN_METADATA=yes
# PROJ.4 stuff
-PROJ_INCLUDE = -I@CMAKE_WIN_INSTALL_PREFIX@\include
-PROJ_LIBRARY = @CMAKE_WIN_INSTALL_PREFIX@\lib\proj_4_9.lib
+PROJ_INCLUDE = -I@SB_INSTALL_PREFIX_NATIVE@\include
+PROJ_LIBRARY = @SB_INSTALL_PREFIX_NATIVE@\lib\proj_4_9.lib
# Uncomment to use libcurl (DLL by default)
# The cURL library is used for WCS, WMS, GeoJSON, SRS call importFromUrl(), WFS, GFT, CouchDB, /vsicurl/ etc.
-CURL_DIR=@CMAKE_WIN_INSTALL_PREFIX@
+CURL_DIR=@SB_INSTALL_PREFIX_NATIVE@
CURL_INC = -I$(CURL_DIR)\include
# Uncoment following line to use libcurl as dynamic library
CURL_LIB = $(CURL_DIR)\lib\libcurl_imp.lib wsock32.lib wldap32.lib winmm.lib
# Uncomment for GEOS support (GEOS >= 3.1.0 required)
-GEOS_DIR=@CMAKE_WIN_INSTALL_PREFIX@
+GEOS_DIR=@SB_INSTALL_PREFIX_NATIVE@
GEOS_CFLAGS = -I$(GEOS_DIR)\include -I$(GEOS_DIR)\include\geos -DHAVE_GEOS
GEOS_LIB = $(GEOS_DIR)\lib\geos.lib $(GEOS_DIR)\lib\geos_c.lib
@@ -63,8 +63,8 @@ GEOS_LIB = $(GEOS_DIR)\lib\geos.lib $(GEOS_DIR)\lib\geos_c.lib
HAVE_OPENJPEG = YES
OPENJPEG_ENABLED = YES
OPENJPEG_VERSION = 20100
-OPENJPEG_CFLAGS = -I@CMAKE_WIN_INSTALL_PREFIX@\include
-OPENJPEG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\openjp2.lib
+OPENJPEG_CFLAGS = -I@SB_INSTALL_PREFIX_NATIVE@\include
+OPENJPEG_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\openjp2.lib
##################################################################
@@ -86,6 +86,10 @@ OPENJPEG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\openjp2.lib
# $(LIBKML_DIR)/third_party\zlib-1.2.3.win32/lib/minizip.lib \
# $(LIBKML_DIR)/third_party\zlib-1.2.3.win32/lib/zlib.lib
+#we use external zlib on windows
+ZLIB_EXTERNAL_LIB = 1
+ZLIB_INC = -I@SB_INSTALL_PREFIX_NATIVE@\include
+ZLIB_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\zlib.lib
# Uncomment the following and update to enable NCSA HDF Release 4 support.
#HDF4_PLUGIN = NO
--
GitLab