From 01d39fce988eb9935a4bf8ba2b383483b48fe6e7 Mon Sep 17 00:00:00 2001 From: XanthosXanthopoulos Date: Thu, 21 Nov 2024 15:04:00 +0200 Subject: [PATCH] Set min macos version [skip ci] --- libtiledbsoma/CMakeLists.txt | 1 + libtiledbsoma/src/soma/soma_attribute.h | 28 ++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/libtiledbsoma/CMakeLists.txt b/libtiledbsoma/CMakeLists.txt index 915449f756..c8a181c4fe 100644 --- 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 index ef8a5d5146..3ba5cd5abd 100644 --- 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,28 @@ class SOMAAttribute : public virtual SOMAColumn { query->select_columns(std::vector({attribute.name()}), if_not_empty); }; - inline soma_column_datatype_t type() const { + inline virtual soma_column_datatype_t type() const override { return soma_column_datatype_t::SOMA_COLUMN_ATTRIBUTE; } - inline std::optional domain_type() const { + inline virtual std::optional domain_type() const override { return std::nullopt; } - inline std::optional data_type() const { + inline virtual std::optional data_type() const override { return attribute.type(); } - inline std::optional> tiledb_dimensions() { + inline virtual std::optional> tiledb_dimensions() override { return std::nullopt; } - inline std::optional> tiledb_attributes() { + inline virtual std::optional> tiledb_attributes() override { return std::vector({attribute}); } inline virtual std::optional> - tiledb_enumerations() { + tiledb_enumerations() override { if (!enumeration.has_value()) { return std::nullopt; } @@ -83,22 +83,22 @@ class SOMAAttribute : public virtual SOMAColumn { virtual void _set_dim_points( const std::unique_ptr& query, const SOMAContext& ctx, - const std::any& points) const; + const std::any& points) const override; virtual void _set_dim_ranges( const std::unique_ptr& 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& domain) const; + NDRectangle& rectangle, const std::vector& 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;