Skip to content

Commit d0d7660

Browse files
Downgrade min macos version [skip ci]
1 parent c5ed9da commit d0d7660

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

apis/python/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,8 @@ def run(self):
254254
CXX_FLAGS.append(f'-Wl,-rpath,{str(tiledb_dir / "lib")}')
255255

256256
if sys.platform == "darwin":
257-
CXX_FLAGS.append("-mmacosx-version-min=13.3")
257+
CXX_FLAGS.append("-D_LIBCPP_DISABLE_AVAILABILITY")
258+
CXX_FLAGS.append("-mmacosx-version-min=11.0")
258259

259260
if os.name == "posix" and sys.platform != "darwin":
260261
LIB_DIRS.append(str(tiledbsoma_dir / "lib" / "x86_64-linux-gnu"))

libtiledbsoma/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ option(TILEDB_SANITIZER "Sanitizer to use in TILEDB. ")
7676
# Enable compiler cache to speed up recompilation
7777
find_program(CCACHE_FOUND ccache)
7878

79+
set(CMAKE_VERBOSE_MAKEFILE ON)
80+
7981
if(CCACHE_FOUND)
8082
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
8183
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
@@ -113,6 +115,8 @@ endif()
113115
if(APPLE)
114116
set(CMAKE_MACOSX_RPATH ON)
115117

118+
set(CMAKE_OSX_DEPLOYMENT_TARGET 11)
119+
116120
# Don't allow macOS .frameworks to be used for dependencies.
117121
set(CMAKE_FIND_FRAMEWORK NEVER)
118122
endif()
@@ -274,7 +278,7 @@ add_definitions(-D_FILE_OFFSET_BITS=64)
274278

275279
# Disable incorrect availability check on conda build
276280
# https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
277-
add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
281+
# add_definitions(-D_LIBCPP_DISABLE_AVAILABILITY)
278282

279283
# AVX2 flag
280284
include(CheckAVX2Support)

libtiledbsoma/src/geometry/polygon.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Polygon::Polygon(
66
std::vector<std::vector<BasePoint>>&& interiorRings)
77
: exteriorRing(exteriorRing)
88
, interiorRings(interiorRings) {
9+
10+
printer(0.1);
911
}
1012

1113
Polygon::~Polygon() {

libtiledbsoma/src/geometry/polygon.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define TILEDBSOMA_POLYGON_H
33

44
#include <vector>
5+
#include <iostream>
56

67
#include "base.h"
78
#include "point.h"
@@ -15,6 +16,10 @@ class Polygon {
1516
std::vector<std::vector<BasePoint>>());
1617
~Polygon();
1718

19+
template <typename T> requires std::floating_point<T> void printer(T a) {
20+
std::cout << a << std::endl;
21+
}
22+
1823
std::vector<BasePoint> exteriorRing;
1924
std::vector<std::vector<BasePoint>> interiorRings;
2025
};

0 commit comments

Comments
 (0)