From a316a1b298c3eb4e4ec94da1ab6c96ec3f8b2710 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Tue, 13 Sep 2016 12:36:13 +0200
Subject: [PATCH] SuperBuild: geos: check for more version of msvc 2015
---
SuperBuild/CMake/External_geos.cmake | 20 ++++++++++----------
SuperBuild/patches/GEOS/nmake.opt | 3 +++
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/SuperBuild/CMake/External_geos.cmake b/SuperBuild/CMake/External_geos.cmake
index 3dbf4d83b0..ce92f5b2a6 100644
--- a/SuperBuild/CMake/External_geos.cmake
+++ b/SuperBuild/CMake/External_geos.cmake
@@ -3,17 +3,15 @@ INCLUDE_ONCE_MACRO(GEOS)
SETUP_SUPERBUILD(GEOS)
if(MSVC)
- set(GEOS_PATCH_COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/patches/GEOS/CMakeLists.txt
- ${CMAKE_SOURCE_DIR}/patches/GEOS/nmake.opt
- ${GEOS_SB_SRC})
-
- set(GEOS_CMAKE_COMMAND ${SB_CMAKE_COMMAND} -DGEOS_SB_SRC=${GEOS_SB_SRC})
+ set(GEOS_PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_SOURCE_DIR}/patches/GEOS/CMakeLists.txt
+ ${CMAKE_SOURCE_DIR}/patches/GEOS/nmake.opt
+ ${GEOS_SB_SRC})
+ set(GEOS_CMAKE_COMMAND ${SB_CMAKE_COMMAND} -DGEOS_SB_SRC=${GEOS_SB_SRC})
else()
- set(GEOS_PATCH_COMMAND)
-
- set(GEOS_CMAKE_COMMAND ${SB_CMAKE_COMMAND})
+ set(GEOS_PATCH_COMMAND)
+ set(GEOS_CMAKE_COMMAND ${SB_CMAKE_COMMAND})
endif()
@@ -32,7 +30,9 @@ ExternalProject_Add(GEOS
CMAKE_COMMAND ${GEOS_CMAKE_COMMAND}
)
-SUPERBUILD_PATCH_SOURCE(GEOS)
+if(NOT MSVC)
+ SUPERBUILD_PATCH_SOURCE(GEOS)
+endif()
set(_SB_GEOS_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
diff --git a/SuperBuild/patches/GEOS/nmake.opt b/SuperBuild/patches/GEOS/nmake.opt
index 4b53da4032..ca21bd2523 100644
--- a/SuperBuild/patches/GEOS/nmake.opt
+++ b/SuperBuild/patches/GEOS/nmake.opt
@@ -138,6 +138,9 @@ GEOS_MSC = 1900
!ELSEIF "$(_NMAKE_VER)" == "14.00.23918.0"
GEOS_MSVC = 14.0
GEOS_MSC = 1900
+!ELSEIF "$(_NMAKE_VER)" == "14.00.24210.0"
+GEOS_MSVC = 14.0
+GEOS_MSC = 1900
!ELSE
GEOS_MSVC = 0.0
GEOS_MSC = 0
--
GitLab