diff --git a/SuperBuild/CMake/External_geos.cmake b/SuperBuild/CMake/External_geos.cmake index 3dbf4d83b04def76047263f5940c204eeebe3339..ce92f5b2a62f7bb375753f971e2e2cb44758f442 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 4b53da4032239bc9669cf2aec96c4ba2eca281e6..ca21bd252387c8b166343bc966871399a2b36abd 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