Commit dc5bae43 authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

Merge branch '2190-update-superbuild-dependencies-for-geos-patch-version' into 'release-7.3'

Resolve "Update superbuild dependencies for geos (patch version)"

See merge request !814
parents 0b8c4f8b d8962aff
Pipeline #7433 failed with stages
in 149 minutes and 31 seconds
......@@ -24,8 +24,8 @@ SETUP_SUPERBUILD(GEOS)
ExternalProject_Add(GEOS
PREFIX GEOS
URL "http://download.osgeo.org/geos/geos-3.6.1.tar.bz2"
URL_MD5 c97e338b3bc81f9848656e9d693ca6cc
URL "http://download.osgeo.org/geos/geos-3.6.5.tar.bz2"
URL_MD5 5ddbbe9dbaf0ac45a36856c185c56b23
SOURCE_DIR ${GEOS_SB_SRC}
BINARY_DIR ${GEOS_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......@@ -43,8 +43,6 @@ ExternalProject_Add(GEOS
LOG_INSTALL 1
)
# Patch still needed with version 3.6.1 to avoid error during CMake configuration
# See https://trac.osgeo.org/geos/ticket/753
SUPERBUILD_PATCH_SOURCE(GEOS)
set(_SB_GEOS_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
......
diff -burN geos-3.6.1.orig/cmake/modules/GenerateSourceGroups.cmake geos-3.6.1/cmake/modules/GenerateSourceGroups.cmake
--- geos-3.6.1.orig/cmake/modules/GenerateSourceGroups.cmake 1970-01-01 01:00:00.000000000 +0100
+++ geos-3.6.1/cmake/modules/GenerateSourceGroups.cmake 2017-06-19 11:19:32.143054641 +0200
@@ -0,0 +1,17 @@
+#
+# Macro generates tree of IDE source groups based on folders structure
+# Source: http://www.cmake.org/pipermail/cmake/2013-November/056332.html
+#
+macro(GenerateSourceGroups curdir)
+ file(GLOB children RELATIVE ${PROJECT_SOURCE_DIR}/${curdir} ${PROJECT_SOURCE_DIR}/${curdir}/*)
+ foreach(child ${children})
+ if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/${curdir}/${child})
+ GenerateSourceGroups(${curdir}/${child})
+ else()
+ string(REPLACE "/" "\\" groupname ${curdir})
+ # I would like to call the src root folder in a different name, only in visual studio (not mandatory requirement)
+ string(REPLACE "src" "Source Files" groupname ${groupname})
+ source_group(${groupname} FILES ${PROJECT_SOURCE_DIR}/${curdir}/${child})
+ endif()
+ endforeach()
+endmacro()
\ Pas de fin de ligne à la fin du fichier
Supports Markdown
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