Skip to content

Commit

Permalink
Downgrade min macos version [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
XanthosXanthopoulos committed Jan 5, 2025
1 parent c5ed9da commit 17729f0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion apis/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
4 changes: 4 additions & 0 deletions libtiledbsoma/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down
3 changes: 0 additions & 3 deletions libtiledbsoma/src/tiledbsoma/tiledbsoma
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions libtiledbsoma/test/unit_soma_column.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 17729f0

Please sign in to comment.