Changeset: 67c508b66aec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/67c508b66aec
Modified Files:
cmake/Modules/FindRTree.cmake
cmake/monetdb-findpackages.cmake
gdk/CMakeLists.txt
Branch: geo-update-dev
Log Message:
Adds librtree detection to CMake. librtree must be installed and build
with -fPIC option
diffs (64 lines):
diff --git a/cmake/Modules/FindRTree.cmake b/cmake/Modules/FindRTree.cmake
--- a/cmake/Modules/FindRTree.cmake
+++ b/cmake/Modules/FindRTree.cmake
@@ -9,15 +9,15 @@
find_path(RTREE_INCLUDE_DIR NAMES rtree.h)
# Look for the library.
-find_library(RTREE_LIBRARY NAMES librtree)
+find_library(RTREE_LIBRARY NAMES librtree.a)
# Handle the QUIETLY and REQUIRED arguments and set RTREE_FOUND to TRUE if all
listed variables are TRUE.
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(rtree REQUIRED_VARS RTREE_LIBRARY
RTREE_INCLUDE_DIR VERSION_VAR)
+find_package_handle_standard_args(RTree REQUIRED_VARS RTREE_LIBRARY
RTREE_INCLUDE_DIR)
if(RTREE_FOUND)
- add_library(rtree:rtree UNKNOWN IMPORTED)
+ add_library(rtree::rtree UNKNOWN IMPORTED)
set_target_properties(rtree::rtree
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${RTREE_INCLUDE_DIR}")
@@ -27,4 +27,4 @@ if(RTREE_FOUND)
IMPORTED_LOCATION "${RTREE_LIBRARY}")
endif()
-mark_as_advanced(RTREE_INCLUDE_DIR RTREE_LIBRARIES GEOS_VERSION)
+mark_as_advanced(RTREE_INCLUDE_DIR RTREE_LIBRARIES)
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -19,7 +19,7 @@ else()
endif()
if (RTREE)
- find_package(rtree)
+ find_package(RTree)
endif()
if(WITH_LZMA)
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -95,9 +95,9 @@ target_include_directories(bat
$<TARGET_PROPERTY:stream,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:matomic,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mstring,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:rtree::rtree,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>
- "/usr/local/include/")
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
target_link_libraries(bat
PRIVATE
@@ -107,7 +107,7 @@ target_link_libraries(bat
monetdb_config_header
moptions
mutils
- "/usr/local/lib/librtree.a"
+ rtree::rtree
$<$<NOT:$<PLATFORM_ID:Windows>>:m>
$<$<PLATFORM_ID:Windows>:ws2_32>
$<$<BOOL:${KVM_FOUND}>:KVM::KVM>
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
