[c++] Add option to link installed spdlog lib

libtiledbsoma/CMakeLists.txt

@@ -57,6 +57,7 @@ option(CMAKE_IDE "(Used for CLion builds). Disables superbuild and sets the EP i
 option(FORCE_BUILD_TILEDB "Forces a local build of TileDB instead of searching system paths." OFF)
 option(TILEDB_FORCE_ALL_DEPS "Forces a local build of TileDB instead of searching system paths." OFF)
 option(DOWNLOAD_TILEDB_PREBUILT "If tiledb is being super built, this controls downloading prebuilt artifacts or building from source" ON)
+option(SPDLOG_LINK_SHARED "Link installed spdlog as an shared library instead of using it as header only" OFF)
 
 # TileDB BUILD Options
 # NOTE: TileDB Embedded version is controlled in cmake/Modules/FindTileDB_EP.cmake
@@ -234,7 +235,13 @@ if(MSVC)
   )
 else()
 
-  set(TILEDBSOMA_COMPILE_OPTIONS -Wall -Wextra -DSPDLOG_USE_STD_FORMAT -D_LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION=2)
+  set(TILEDBSOMA_COMPILE_OPTIONS -Wall -Wextra -D_LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION=2)
+
+  if (NOT SPDLOG_LINK_SHARED)
+    list(APPEND TILEDBSOMA_COMPILE_OPTIONS -DSPDLOG_USE_STD_FORMAT)
+  else()
+    add_definitions(-DSPDLOG_COMPILED_LIB)
+  endif()
 
   if(${TILEDBSOMA_ENABLE_WERROR})
     set(TILEDBSOMA_WERROR_OPTION -Werror)

libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake

@@ -39,6 +39,10 @@ else()
 endif()
 
 if (NOT SPDLOG_FOUND)
+  if(SPDLOG_LINK_SHARED) 
+    message(FATAL_ERROR "Unable to find installed spdlog")
+  endif()
+
   if(SUPERBUILD)
     if (WIN32)
       find_package(Git REQUIRED)

libtiledbsoma/cmake/Superbuild.cmake

@@ -51,6 +51,7 @@ set(INHERITED_CMAKE_ARGS
   -DTILEDBSOMA_BUILD_CLI=${TILEDBSOMA_BUILD_CLI}
   -DTILEDBSOMA_ENABLE_TESTING=${TILEDBSOMA_ENABLE_TESTING}
   -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+  -DSPDLOG_LINK_SHARED=${SPDLOG_LINK_SHARED}
 )
 
 ############################################################

libtiledbsoma/src/CMakeLists.txt

@@ -60,6 +60,12 @@ add_library(TILEDB_SOMA_OBJECTS OBJECT
   ${CMAKE_CURRENT_SOURCE_DIR}/external/src/thread_pool/status.cc
 )
 
+if(SPDLOG_LINK_SHARED)
+  target_link_libraries(TILEDB_SOMA_OBJECTS PUBLIC spdlog::spdlog)
+else()
+  target_include_directories(TILEDB_SOMA_OBJECTS PRIVATE $<TARGET_PROPERTY:spdlog::spdlog,INTERFACE_INCLUDE_DIRECTORIES>)
+endif()
+
 target_compile_definitions(TILEDB_SOMA_OBJECTS
   PRIVATE
     -DTILEDB_NO_API_DEPRECATION_WARNINGS
@@ -76,7 +82,6 @@ target_link_options(TILEDB_SOMA_OBJECTS
     ${TILEDBSOMA_SANITIZER_FLAG}
 )
 
-
 set_property(TARGET TILEDB_SOMA_OBJECTS PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_include_directories(TILEDB_SOMA_OBJECTS
   PRIVATE
@@ -87,7 +92,6 @@ target_include_directories(TILEDB_SOMA_OBJECTS
   ${CMAKE_CURRENT_SOURCE_DIR}/external/include
   ${CMAKE_CURRENT_SOURCE_DIR}/external/include/nanoarrow
   $<TARGET_PROPERTY:TileDB::tiledb_shared,INTERFACE_INCLUDE_DIRECTORIES>
-  $<TARGET_PROPERTY:spdlog::spdlog,INTERFACE_INCLUDE_DIRECTORIES>
   ${pybind11_INCLUDE_DIRS}
 )
 
@@ -164,6 +168,7 @@ else()
     $<TARGET_OBJECTS:TILEDB_SOMA_GEOMETRY_OBJECTS>
     $<TARGET_OBJECTS:TILEDBSOMA_NANOARROW_OBJECT>
   )
+
   list(APPEND TILEDBSOMA_INSTALL_TARGETS tiledbsoma)
   target_link_libraries(tiledbsoma
     PUBLIC
@@ -312,7 +317,7 @@ if(TILEDBSOMA_BUILD_CLI)
   target_link_libraries(tiledbsoma-cli
     PUBLIC
       # CLI11::CLI11
-      # spdlog::spdlog
+      spdlog::spdlog
       tiledbsoma
       TileDB::tiledb_shared
   )

libtiledbsoma/test/CMakeLists.txt

@@ -40,6 +40,12 @@ add_executable(unit_soma
 #    unit_thread_pool.cc
 )
 
+if(SPDLOG_LINK_SHARED)
+  target_link_libraries(unit_soma PRIVATE spdlog::spdlog)
+else()
+  target_include_directories(unit_soma PRIVATE $<TARGET_PROPERTY:spdlog::spdlog,INTERFACE_INCLUDE_DIRECTORIES>)
+endif()
+
 target_link_libraries(unit_soma
   PRIVATE
     Catch2::Catch2WithMain
@@ -108,6 +114,12 @@ add_executable(unit_geometry
 #    unit_thread_pool.cc
 )
 
+if(SPDLOG_LINK_SHARED)
+  target_link_libraries(unit_geometry PRIVATE spdlog::spdlog)
+else()
+  target_include_directories(unit_geometry PRIVATE $<TARGET_PROPERTY:spdlog::spdlog,INTERFACE_INCLUDE_DIRECTORIES>)
+endif()
+
 target_link_libraries(unit_geometry
   PRIVATE
     Catch2::Catch2WithMain
@@ -125,7 +137,6 @@ target_include_directories(unit_geometry
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/external/include
     ${pybind11_INCLUDE_DIRS}
     ${TILEDB_SOMA_EXPORT_HEADER_DIR}
-    $<TARGET_PROPERTY:spdlog::spdlog,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 target_compile_definitions(unit_geometry