From 57d3a1c41dda24dcc6e803ad4af304f36a209dc4 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Tue, 8 Dec 2015 11:44:28 +0100
Subject: [PATCH] SuperBuild: geotiff update config values
---
SuperBuild/CMake/External_geotiff.cmake | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/SuperBuild/CMake/External_geotiff.cmake b/SuperBuild/CMake/External_geotiff.cmake
index eb19588e08..899628765d 100644
--- a/SuperBuild/CMake/External_geotiff.cmake
+++ b/SuperBuild/CMake/External_geotiff.cmake
@@ -19,16 +19,15 @@ else()
# set proj back to its original value
set(proj GEOTIFF)
- if(MSVC)
- ADD_SUPERBUILD_CMAKE_VAR(TIFF_INCLUDE_DIR)
- ADD_SUPERBUILD_CMAKE_VAR(TIFF_LIBRARY)
- ADD_SUPERBUILD_CMAKE_VAR(PROJ4_INCLUDE_DIR)
- ADD_SUPERBUILD_CMAKE_VAR(PROJ4_LIBRARY)
- ADD_SUPERBUILD_CMAKE_VAR(ZLIB_INCLUDE_DIR)
- ADD_SUPERBUILD_CMAKE_VAR(ZLIB_LIBRARY)
- ADD_SUPERBUILD_CMAKE_VAR(JPEG_INCLUDE_DIR)
- ADD_SUPERBUILD_CMAKE_VAR(JPEG_LIBRARY)
- endif()
+ set(GEOTIFF_SB_CONFIG)
+ ADD_SUPERBUILD_CMAKE_VAR(TIFF_INCLUDE_DIR)
+ ADD_SUPERBUILD_CMAKE_VAR(TIFF_LIBRARY)
+ ADD_SUPERBUILD_CMAKE_VAR(PROJ4_INCLUDE_DIR)
+ ADD_SUPERBUILD_CMAKE_VAR(PROJ4_LIBRARY)
+ ADD_SUPERBUILD_CMAKE_VAR(ZLIB_INCLUDE_DIR)
+ ADD_SUPERBUILD_CMAKE_VAR(ZLIB_LIBRARY)
+ ADD_SUPERBUILD_CMAKE_VAR(JPEG_INCLUDE_DIR)
+ ADD_SUPERBUILD_CMAKE_VAR(JPEG_LIBRARY)
ExternalProject_Add(${proj}
PREFIX ${proj}
@@ -44,6 +43,7 @@ else()
-DCMAKE_BUILD_TYPE:STRING=Release
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
+ ${GEOTIFF_SB_CONFIG}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
)
--
GitLab