Add option to install libtiledb.so (#361)

* Add option to install libtiledb.so

* Change INSTALL configuration

* Refactor install group condition

* Pass TILEDB_DOWNLOADED variable that is passed

* Remove logging line

* Change install directory

* Fix TileDB search directory and use RPATH

Author: dudoslav

apis/python/CMakeLists.txt

@@ -64,14 +64,23 @@ target_compile_definitions(
         VERSION_INFO=${PROJECT_VERSION}
 )
 
-if (APPLE)
-  set_target_properties(${VSPY_TARGET_NAME} PROPERTIES INSTALL_RPATH "@loader_path/lib")
-elseif(UNIX)
-  set_target_properties(${VSPY_TARGET_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
-endif()
-
 # Install the extension module
 install(TARGETS ${VSPY_TARGET_NAME} LIBRARY DESTINATION .)
 
-# Install libtiledb so that we can repackage it with the extension
-install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION lib)
+if (TILEDB_DOWNLOADED)
+  message(STATUS "Adding libtiledb into install group")
+  # Install libtiledb so that we can repackage it with the extension
+  install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+  if (APPLE)
+    set_target_properties(${VSPY_TARGET_NAME} PROPERTIES INSTALL_RPATH "@loader_path/lib")
+  elseif(UNIX)
+    set_target_properties(${VSPY_TARGET_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
+  endif()
+else()
+  # If using external TileDB core library force it to be linked at runtime using RPATH
+  get_property(TILEDB_LOCATION TARGET TileDB::tiledb_shared PROPERTY LOCATION)
+  get_filename_component(TILEDB_LOCATION ${TILEDB_LOCATION} DIRECTORY)
+  message(STATUS "Setting RPATH to ${TILEDB_LOCATION}")
+  set_target_properties(${VSPY_TARGET_NAME} PROPERTIES INSTALL_RPATH ${TILEDB_LOCATION})
+endif()

pyproject.toml

@@ -55,6 +55,7 @@ sdist.cmake = true
 
 [tool.scikit-build.cmake.define]
 TILEDB_VS_PYTHON = "ON"
+TILEDB_PATH = {env="TILEDB_PATH"}
 
 [tool.setuptools_scm]
 version_file = "apis/python/src/tiledb/vector_search/version.py"

src/CMakeLists.txt

@@ -54,6 +54,12 @@ option(BUILD_CLI "Build the index and query command-line interface programs" OFF
 
 set(CMAKE_CXX_STANDARD 20)
 
+if (TILEDB_PATH)
+    set(CMAKE_PREFIX_PATH  "${TILEDB_PATH};${CMAKE_PREFIX_PATH}")
+    message(STATUS "Adding TILEDB_PATH to CMAKE_PREFIX_PATH")
+endif()
+
+
 # -----------------------------------------------------------------------------
 # Extend the module path so we can find our custom modules
 # -----------------------------------------------------------------------------

src/cmake/Modules/FindTileDB_EP.cmake

@@ -66,6 +66,7 @@ else()
 
     list(APPEND FORWARD_EP_CMAKE_ARGS -DEP_TILEDB_BUILT=TRUE)
     list(APPEND EXTERNAL_PROJECTS ep_tiledb)
+    set(TILEDB_DOWNLOADED "True")
   else()
     message(FATAL_ERROR "Unable to find TileDB library.")
   endif()

src/cmake/Superbuild.cmake

@@ -50,6 +50,17 @@ set(EXTERNAL_PROJECTS)
 # character other than a semicolon.
 list(JOIN CMAKE_PREFIX_PATH "|" CMAKE_PREFIX_PATH_STR)
 
+############################################################
+# Set up external projects for dependencies
+############################################################
+
+# These includes modify the EXTERNAL_PROJECTS variable.
+
+# need spdlog to set up any of its needed targets...
+# include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindSpdlog.cmake)
+#... before tiledb sets up only half of them...
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindTileDB_EP.cmake)
+
 # Forward any additional CMake args to the non-superbuild.
 set(INHERITED_CMAKE_ARGS
   -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
@@ -83,19 +94,9 @@ set(INHERITED_CMAKE_ARGS
   -DPython3_FIND_REGISTRY=${Python3_FIND_REGISTRY}
   -DPython3_INCLUDE_DIR=${Python3_INCLUDE_DIR}
   -Dpybind11_DIR=${pybind11_DIR}
+  -DTILEDB_DOWNLOADED=${TILEDB_DOWNLOADED}
 )
 
-############################################################
-# Set up external projects for dependencies
-############################################################
-
-# These includes modify the EXTERNAL_PROJECTS variable.
-
-# need spdlog to set up any of its needed targets...
-# include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindSpdlog.cmake)
-#... before tiledb sets up only half of them...
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindTileDB_EP.cmake)
-
 ############################################################
 # 'make format' target
 ############################################################