Commit a316a1b2 authored by Rashad Kanavath's avatar Rashad Kanavath

SuperBuild: geos: check for more version of msvc 2015

parent ce2662f0
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment