Changeset: c68219668084 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c68219668084
Modified Files:
cmake/Modules/FindGeos.cmake
cmake/monetdb-findpackages.cmake
Branch: geo-update
Log Message:
Require version 3.8.0 or newer of geos library.
diffs (36 lines):
diff --git a/cmake/Modules/FindGeos.cmake b/cmake/Modules/FindGeos.cmake
--- a/cmake/Modules/FindGeos.cmake
+++ b/cmake/Modules/FindGeos.cmake
@@ -14,14 +14,18 @@ find_library(GEOS_LIBRARIES NAMES geos_c
# Handle the QUIETLY and REQUIRED arguments and set GEOS_FOUND to TRUE if all
listed variables are TRUE.
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Geos DEFAULT_MSG GEOS_LIBRARIES
GEOS_INCLUDE_DIR)
-if(GEOS_FOUND)
+if(GEOS_INCLUDE_DIR AND EXISTS "${GEOS_INCLUDE_DIR}/geos_c.h")
file(STRINGS "${GEOS_INCLUDE_DIR}/geos_c.h" GEOS_VERSION_LINES REGEX
"#define[ \t]+GEOS_VERSION_(MAJOR|MINOR|PATCH)")
string(REGEX REPLACE ".*GEOS_VERSION_MAJOR *\([0-9]*\).*" "\\1"
GEOS_VERSION_MAJOR "${GEOS_VERSION_LINES}")
string(REGEX REPLACE ".*GEOS_VERSION_MINOR *\([0-9]*\).*" "\\1"
GEOS_VERSION_MINOR "${GEOS_VERSION_LINES}")
string(REGEX REPLACE ".*GEOS_VERSION_PATCH *\([0-9]*\).*" "\\1"
GEOS_VERSION_PATCH "${GEOS_VERSION_LINES}")
set(GEOS_VERSION
"${GEOS_VERSION_MAJOR}.${GEOS_VERSION_MINOR}.${GEOS_VERSION_PATCH}")
+endif()
+
+find_package_handle_standard_args(Geos REQUIRED_VARS GEOS_LIBRARIES
GEOS_INCLUDE_DIR VERSION_VAR GEOS_VERSION)
+
+if(GEOS_FOUND)
add_library(Geos::Geos UNKNOWN IMPORTED)
set_target_properties(Geos::Geos
PROPERTIES
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -81,7 +81,7 @@ endif()
find_package(KVM)
if(GEOM)
- find_package(Geos)
+ find_package(Geos 3.8.0)
endif()
if(SHP)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
