From de3f8958f7bcd76d172f1f60af3c5946dd08fd17 Mon Sep 17 00:00:00 2001 From: XanthosXanthopoulos Date: Fri, 3 Jan 2025 20:57:58 +0200 Subject: [PATCH] Downgrade min macos version [skip ci] --- apis/python/setup.py | 3 ++- libtiledbsoma/CMakeLists.txt | 8 ++++++-- libtiledbsoma/src/tiledbsoma/tiledbsoma | 3 --- libtiledbsoma/test/unit_soma_column.cc | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apis/python/setup.py b/apis/python/setup.py index ece776b0bb..46ce86f7c0 100644 --- 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 index 02c06cf96e..194d90260f 100644 --- 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/src/tiledbsoma/tiledbsoma b/libtiledbsoma/src/tiledbsoma/tiledbsoma index 8dda098f30..3f71c123a4 100644 --- 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 index 9680b58d9f..86658d31ba 100644 --- a/libtiledbsoma/test/unit_soma_column.cc +++ b/libtiledbsoma/test/unit_soma_column.cc @@ -34,6 +34,8 @@ #include #include #include +#include "../src/soma/soma_attribute.h" +#include "../src/soma/soma_dimension.h" #include "common.h" const int64_t SOMA_JOINID_DIM_MAX = 99;