Skip to content

Commit d1081b4

Browse files
authored
Use correct path to rtree libraries (#16)
* lowercase r * bump minimum rtree version
1 parent 85787f6 commit d1081b4

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ find_library(spatialindexlib
145145
)
146146

147147
if((NOT spatialindexlib) AND (Python_FOUND))
148-
message(STATUS "Spatialindex not found, attempting to use the shared library provided by the Rtree Python package")
148+
message(STATUS "Spatialindex not found, attempting to use the shared library provided by the rtree Python package")
149149

150-
# Rtree stores its shared libraries in very different ways on Mac and Linux.
151-
# On Linux we want .../site-packages/Rtree.libs/libspatialindex-XXXXXXXX.so
150+
# rtree stores its shared libraries in very different ways on Mac and Linux.
151+
# On Linux we want .../site-packages/rtree.libs/libspatialindex-XXXXXXXX.so
152152
# (which is what is returned by rtree.core.rt._name), whereas on Mac we have
153153
# *two* shared libraries called libspatialindex.dylib and libspatialindex_c.dylib
154154
# and these are stored in .../site-packages/rtree/lib/. Since rtree.core.rt._name
@@ -223,7 +223,7 @@ endif()
223223

224224
target_link_libraries(supermesh PUBLIC ${link_libraries})
225225
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
226-
set_target_properties(supermesh PROPERTIES INSTALL_RPATH "$ORIGIN/../../Rtree.libs")
226+
set_target_properties(supermesh PROPERTIES INSTALL_RPATH "$ORIGIN/../../rtree.libs")
227227
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
228228
set_target_properties(supermesh PROPERTIES INSTALL_RPATH "@loader_path/../../rtree/lib")
229229
endif()

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ authors = [
1616
{name = "Jack Betteridge", email = "J.Betteridge@imperial.ac.uk"},
1717
]
1818
dependencies = [
19-
"rtree>=1.2",
19+
"rtree>=1.4.1",
2020
]
2121
classifiers = [
2222
"Development Status :: 5 - Production/Stable",

0 commit comments

Comments
 (0)