Set min macos version [skip ci]

single-cell-data · Nov 21, 2024 · 792dc96 · 792dc96
1 parent a0618f1
commit 792dc96
Show file tree

Hide file tree

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

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
@@ -112,6 +112,7 @@ endif()
 # Use @rpath on macOS for building shared libraries.
 if(APPLE)
   set(CMAKE_MACOSX_RPATH ON)
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
 
   # Don't allow macOS .frameworks to be used for dependencies.
   set(CMAKE_FIND_FRAMEWORK NEVER)

diff --git a/libtiledbsoma/src/soma/soma_attribute.h b/libtiledbsoma/src/soma/soma_attribute.h
@@ -28,11 +28,11 @@ class SOMAAttribute : public virtual SOMAColumn {
         , enumeration(enumeration) {
     }
 
-    virtual inline std::string name() const {
+    virtual inline std::string name() const override {
         return attribute.name();
     }
 
-    virtual inline bool isIndexColumn() const {
+    virtual inline bool isIndexColumn() const override {
         return false;
     }
 
@@ -42,28 +42,31 @@ class SOMAAttribute : public virtual SOMAColumn {
         query->select_columns(std::vector({attribute.name()}), if_not_empty);
     };
 
-    inline soma_column_datatype_t type() const {
+    virtual inline soma_column_datatype_t type() const override {
         return soma_column_datatype_t::SOMA_COLUMN_ATTRIBUTE;
     }
 
-    inline std::optional<tiledb_datatype_t> domain_type() const {
+    virtual inline std::optional<tiledb_datatype_t> domain_type()
+        const override {
         return std::nullopt;
     }
 
-    inline std::optional<tiledb_datatype_t> data_type() const {
+    virtual inline std::optional<tiledb_datatype_t> data_type() const override {
         return attribute.type();
     }
 
-    inline std::optional<std::vector<Dimension>> tiledb_dimensions() {
+    virtual inline std::optional<std::vector<Dimension>> tiledb_dimensions()
+        override {
         return std::nullopt;
     }
 
-    inline std::optional<std::vector<Attribute>> tiledb_attributes() {
+    virtual inline std::optional<std::vector<Attribute>> tiledb_attributes()
+        override {
         return std::vector({attribute});
     }
 
-    inline virtual std::optional<std::vector<Enumeration>>
-    tiledb_enumerations() {
+    virtual inline std::optional<std::vector<Enumeration>> tiledb_enumerations()
+        override {
         if (!enumeration.has_value()) {
             return std::nullopt;
         }
@@ -83,22 +86,23 @@ class SOMAAttribute : public virtual SOMAColumn {
     virtual void _set_dim_points(
         const std::unique_ptr<ManagedQuery>& query,
         const SOMAContext& ctx,
-        const std::any& points) const;
+        const std::any& points) const override;
 
     virtual void _set_dim_ranges(
         const std::unique_ptr<ManagedQuery>& query,
         const SOMAContext& ctx,
-        const std::any& ranges) const;
+        const std::any& ranges) const override;
 
     virtual void _set_current_domain_slot(
-        NDRectangle& rectangle, const std::vector<const void*>& domain) const;
+        NDRectangle& rectangle,
+        const std::vector<const void*>& domain) const override;
 
-    virtual std::any _core_domain_slot() const;
+    virtual std::any _core_domain_slot() const override;
 
-    virtual std::any _non_empty_domain_slot(Array& array) const;
+    virtual std::any _non_empty_domain_slot(Array& array) const override;
 
     virtual std::any _core_current_domain_slot(
-        const SOMAContext& ctx, Array& array) const;
+        const SOMAContext& ctx, Array& array) const override;
 
     Attribute attribute;
     std::optional<Enumeration> enumeration;

diff --git a/libtiledbsoma/src/soma/soma_dimension.h b/libtiledbsoma/src/soma/soma_dimension.h
@@ -26,42 +26,45 @@ class SOMADimension : public virtual SOMAColumn {
         : dimension(dimension) {
     }
 
-    inline std::string name() const {
+    virtual inline std::string name() const override {
         return dimension.name();
     }
 
-    inline bool isIndexColumn() const {
+    virtual inline bool isIndexColumn() const override {
         return true;
     }
 
-    inline virtual void select_columns(
+    virtual inline void select_columns(
         const std::unique_ptr<ManagedQuery>& query,
         bool if_not_empty = false) const override {
         query->select_columns(std::vector({dimension.name()}), if_not_empty);
     };
 
-    inline soma_column_datatype_t type() const {
+    virtual inline soma_column_datatype_t type() const override {
         return soma_column_datatype_t::SOMA_COLUMN_DIMENSION;
     }
 
-    inline std::optional<tiledb_datatype_t> domain_type() const {
+    virtual inline std::optional<tiledb_datatype_t> domain_type()
+        const override {
         return dimension.type();
     }
 
-    inline std::optional<tiledb_datatype_t> data_type() const {
+    virtual inline std::optional<tiledb_datatype_t> data_type() const override {
         return std::nullopt;
     }
 
-    inline std::optional<std::vector<Dimension>> tiledb_dimensions() {
+    virtual inline std::optional<std::vector<Dimension>> tiledb_dimensions()
+        override {
         return std::vector({dimension});
     }
 
-    inline std::optional<std::vector<Attribute>> tiledb_attributes() {
+    virtual inline std::optional<std::vector<Attribute>> tiledb_attributes()
+        override {
         return std::nullopt;
     }
 
-    inline virtual std::optional<std::vector<Enumeration>>
-    tiledb_enumerations() {
+    virtual inline virtual std::optional<std::vector<Enumeration>>
+    tiledb_enumerations() override {
         return std::nullopt;
     }
 

diff --git a/libtiledbsoma/src/soma/soma_geometry_column.h b/libtiledbsoma/src/soma/soma_geometry_column.h
@@ -9,8 +9,6 @@
 
 namespace tiledbsoma {
 
-class ArrayBuffers;
-
 using namespace tiledb;
 
 class SOMAGeometryColumn : public virtual SOMAColumn {
@@ -30,11 +28,11 @@ class SOMAGeometryColumn : public virtual SOMAColumn {
         : dimensions(dimensions)
         , attribute(attribute){};
 
-    inline std::string name() const {
+    inline std::string name() const override {
         return SOMA_GEOMETRY_COLUMN_NAME;
     }
 
-    inline bool isIndexColumn() const {
+    inline bool isIndexColumn() const override {
         return true;
     }
 
@@ -44,28 +42,31 @@ class SOMAGeometryColumn : public virtual SOMAColumn {
         query->select_columns(std::vector({attribute.name()}), if_not_empty);
     };
 
-    inline soma_column_datatype_t type() const {
+    inline soma_column_datatype_t type() const override {
         return soma_column_datatype_t::SOMA_COLUMN_GEOMETRY;
     }
 
-    inline std::optional<tiledb_datatype_t> domain_type() const {
+    virtual inline std::optional<tiledb_datatype_t> domain_type()
+        const override {
         return dimensions.front().type();
     }
 
-    inline std::optional<tiledb_datatype_t> data_type() const {
+    virtual inline std::optional<tiledb_datatype_t> data_type() const override {
         return attribute.type();
     }
 
-    inline std::optional<std::vector<Dimension>> tiledb_dimensions() {
+    virtual inline std::optional<std::vector<Dimension>> tiledb_dimensions()
+        override {
         return dimensions;
     }
 
-    inline std::optional<std::vector<Attribute>> tiledb_attributes() {
+    virtual inline std::optional<std::vector<Attribute>> tiledb_attributes()
+        override {
         return std::vector({attribute});
     }
 
-    inline virtual std::optional<std::vector<Enumeration>>
-    tiledb_enumerations() {
+    inline virtual std::optional<std::vector<Enumeration>> tiledb_enumerations()
+        override {
         return std::nullopt;
     }