Bump min macos version

single-cell-data · Jan 7, 2025 · 5eac48e · 5eac48e
1 parent f01c0c6
commit 5eac48e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/python-packaging.yml b/.github/workflows/python-packaging.yml
@@ -112,7 +112,7 @@ jobs:
           CIBW_ENVIRONMENT_LINUX : CC=/opt/rh/gcc-toolset-13/root/usr/bin/gcc CXX=/opt/rh/gcc-toolset-13/root/usr/bin/g++
           CIBW_TEST_SKIP: "*_arm64"
           CMAKE_OSX_ARCHITECTURES: ${{ matrix.cibw_archs_macos }}
-          MACOSX_DEPLOYMENT_TARGET: "11.0"
+          MACOSX_DEPLOYMENT_TARGET: "13.3"
       - name: Upload wheel-${{ matrix.wheel-name }}-${{ matrix.python-version }} to GitHub Actions storage
         uses: actions/upload-artifact@v4
         with:

diff --git a/apis/r/src/Makevars.in b/apis/r/src/Makevars.in
@@ -1,6 +1,6 @@
 CXX_STD = CXX20
 
-## We need the TileDB Headers, and for macOS aka Darwin need to set minimum version 10.14 for macOS
+## We need the TileDB Headers, and for macOS aka Darwin need to set minimum version 13.3 for macOS
 PKG_CPPFLAGS = -I. -I../inst/include/ @tiledb_include@ @cxx20_macos@ -D SPDLOG_USE_STD_FORMAT
 
 ## We also need the TileDB library

diff --git a/libtiledbsoma/CMakeLists.txt b/libtiledbsoma/CMakeLists.txt
@@ -113,6 +113,9 @@ endif()
 if(APPLE)
   set(CMAKE_MACOSX_RPATH ON)
 
+  # Set minimum macOS version to enable certain C++20 features
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
+
   # Don't allow macOS .frameworks to be used for dependencies.
   set(CMAKE_FIND_FRAMEWORK NEVER)
 endif()

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}
 )
 
 # ###########################################################