Skip to content

Commit 6f8c182

Browse files
committed
Add TILEDB_PATH env variable
1 parent 7c20a47 commit 6f8c182

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ find_package(
1414
find_package(pybind11 CONFIG REQUIRED)
1515

1616
# In the future we should use vcpkg
17+
set(TileDB_DIR $ENV{TILEDB_PATH})
1718
find_package(TileDB)
1819
if (NOT TileDB_FOUND)
1920
include(cmake/DownloadTileDB.cmake)
@@ -22,6 +23,7 @@ if (NOT TileDB_FOUND)
2223
RELLIST_HASH SHA256=2221b0ee2af2675d69f9cb31bc22062d3f379eeecc83b5fc713d00fa03d6e56f
2324
)
2425
find_package(TileDB REQUIRED)
26+
set(TILEDB_DOWNLOADED)
2527
endif()
2628

2729
add_subdirectory(tiledb)

tiledb/CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,18 @@ target_link_libraries(
4646

4747
install(TARGETS main libtiledb DESTINATION tiledb)
4848

49-
install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION tiledb/lib)
50-
51-
if (APPLE)
52-
set_target_properties(main PROPERTIES INSTALL_RPATH "@loader_path/lib")
53-
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "@loader_path/lib")
54-
elseif(UNIX)
55-
set_target_properties(main PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
56-
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
49+
if(TILEDB_DOWNLOADED)
50+
message(STATUS "Adding libtiledb.so into install group")
51+
52+
install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION tiledb/lib)
53+
54+
if (APPLE)
55+
set_target_properties(main PROPERTIES INSTALL_RPATH "@loader_path/lib")
56+
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "@loader_path/lib")
57+
elseif(UNIX)
58+
set_target_properties(main PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
59+
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
60+
endif()
5761
endif()
5862

5963
add_subdirectory(cc)

tiledb/cc/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ target_link_libraries(
2929

3030
install(TARGETS cc DESTINATION tiledb)
3131

32-
if (APPLE)
33-
set_target_properties(cc PROPERTIES INSTALL_RPATH "@loader_path/lib")
34-
elseif(UNIX)
35-
set_target_properties(cc PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
32+
if(TILEDB_DOWNLOADED)
33+
if (APPLE)
34+
set_target_properties(cc PROPERTIES INSTALL_RPATH "@loader_path/lib")
35+
elseif(UNIX)
36+
set_target_properties(cc PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
37+
endif()
3638
endif()

0 commit comments

Comments
 (0)