Downgrade min macos version [skip ci]

single-cell-data · Jan 7, 2025 · 97a51f4 · 97a51f4
1 parent 34c3618
commit 97a51f4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/apis/python/setup.py b/apis/python/setup.py
@@ -254,7 +254,8 @@ def run(self):
     CXX_FLAGS.append(f'-Wl,-rpath,{str(tiledb_dir / "lib")}')
 
 if sys.platform == "darwin":
-    CXX_FLAGS.append("-mmacosx-version-min=13.3")
+    # CXX_FLAGS.append("-D_LIBCPP_DISABLE_AVAILABILITY")
+    CXX_FLAGS.append("-mmacosx-version-min=11.0")
 
 if os.name == "posix" and sys.platform != "darwin":
     LIB_DIRS.append(str(tiledbsoma_dir / "lib" / "x86_64-linux-gnu"))

diff --git a/libtiledbsoma/CMakeLists.txt b/libtiledbsoma/CMakeLists.txt
@@ -76,6 +76,8 @@ option(TILEDB_SANITIZER "Sanitizer to use in TILEDB. ")
 # Enable compiler cache to speed up recompilation
 find_program(CCACHE_FOUND ccache)
 
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 if(CCACHE_FOUND)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
@@ -113,6 +115,8 @@ endif()
 if(APPLE)
   set(CMAKE_MACOSX_RPATH ON)
 
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 11)
+
   # Don't allow macOS .frameworks to be used for dependencies.
   set(CMAKE_FIND_FRAMEWORK NEVER)
 endif()
@@ -218,7 +222,7 @@ if(MSVC)
   )
 else()
 
-  set(TILEDBSOMA_COMPILE_OPTIONS -Wall -Wextra -DSPDLOG_USE_STD_FORMAT)
+  set(TILEDBSOMA_COMPILE_OPTIONS -Wall -Wextra)
 
   if(${TILEDBSOMA_ENABLE_WERROR})
     set(TILEDBSOMA_WERROR_OPTION -Werror)
@@ -274,7 +278,7 @@ add_definitions(-D_FILE_OFFSET_BITS=64)
 
 # Disable incorrect availability check on conda build
 # https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
-add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
+# add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
 
 # AVX2 flag
 include(CheckAVX2Support)

diff --git a/libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake b/libtiledbsoma/cmake/Modules/FindSpdlog_EP.cmake
@@ -79,10 +79,10 @@ if (NOT SPDLOG_FOUND)
       PREFIX "externals"
       # Set download name to avoid collisions with only the version number in the filename
       DOWNLOAD_NAME ep_spdlog.zip
-      URL "https://github.com/gabime/spdlog/archive/v1.10.0.zip"
-      URL_HASH SHA1=aa2d4ff13b5393dea83d46caf545c6a303c889cd
-      PATCH_COMMAND
-        ${CONDITIONAL_PATCH}
+      URL "https://github.com/gabime/spdlog/archive/v1.15.0.zip"
+      URL_HASH SHA1=ddf312f7e1fdadf32f475e047bcd1b798422a88c
+      # PATCH_COMMAND
+      #   ${CONDITIONAL_PATCH}
       CMAKE_ARGS
         -DCMAKE_PREFIX_PATH=${EP_INSTALL_PREFIX}
         -DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX}

diff --git a/libtiledbsoma/src/CMakeLists.txt b/libtiledbsoma/src/CMakeLists.txt
@@ -127,13 +127,6 @@ target_include_directories(TILEDB_SOMA_GEOMETRY_OBJECTS
   PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/vendor
-  ${CMAKE_CURRENT_SOURCE_DIR}/soma
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/khash
-  ${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}
 )
 
 # ###########################################################

diff --git a/libtiledbsoma/src/tiledbsoma/tiledbsoma b/libtiledbsoma/src/tiledbsoma/tiledbsoma
@@ -49,9 +49,6 @@
 #include "soma/column_buffer.h"
 #include "soma/soma_array.h"
 #include "soma/soma_collection.h"
-#include "soma/soma_column.h"
-#include "soma/soma_attribute.h"
-#include "soma/soma_dimension.h"
 #include "soma/soma_dataframe.h"
 #include "soma/soma_group.h"
 #include "soma/soma_experiment.h"

diff --git a/libtiledbsoma/test/unit_soma_column.cc b/libtiledbsoma/test/unit_soma_column.cc
@@ -34,6 +34,8 @@
 #include <format>
 #include <tiledb/tiledb>
 #include <tiledbsoma/tiledbsoma>
+#include "../src/soma/soma_attribute.h"
+#include "../src/soma/soma_dimension.h"
 #include "common.h"
 
 const int64_t SOMA_JOINID_DIM_MAX = 99;