Changeset: 9e7e1ca88998 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9e7e1ca88998
Modified Files:
cmake/Modules/FindRTree.cmake
cmake/monetdb-findpackages.cmake
cmake/monetdb-options.cmake
Branch: geo-update-dev
Log Message:
Renames build option to WITH_RTREE
diffs (38 lines):
diff --git a/cmake/Modules/FindRTree.cmake b/cmake/Modules/FindRTree.cmake
--- a/cmake/Modules/FindRTree.cmake
+++ b/cmake/Modules/FindRTree.cmake
@@ -16,7 +16,7 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(RTree REQUIRED_VARS RTREE_LIBRARY
RTREE_INCLUDE_DIR)
-if(RTREE_FOUND)
+if(RTREE_FOUND AND NOT TARGET rtree:rtree)
add_library(rtree::rtree UNKNOWN IMPORTED)
set_target_properties(rtree::rtree
PROPERTIES
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -18,7 +18,7 @@ else()
find_package(Python3 COMPONENTS Interpreter Development NumPy)
endif()
-if (RTREE)
+if(WITH_RTREE)
find_package(RTree)
endif()
diff --git a/cmake/monetdb-options.cmake b/cmake/monetdb-options.cmake
--- a/cmake/monetdb-options.cmake
+++ b/cmake/monetdb-options.cmake
@@ -27,8 +27,8 @@ cmake_dependent_option(CINTEGRATION
"NOT WIN32"
OFF)
-option(RTREE
- "Enable support for rtrees (default=ON)"
+option(WITH_RTREE
+ "Enable support for rtrees (librtree; default=ON)"
ON)
option(PY3INTEGRATION
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
