Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use classic linker with AppleClang 15+ #3167

Merged
merged 6 commits into from
Jul 18, 2024
Merged

fix: use classic linker with AppleClang 15+ #3167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ac1f33
ci: try macos 13
henryiii Jun 25, 2024
4f09e87
fix: try classic linker
henryiii Jul 18, 2024
b0469d6
fix: base on AppleClang version
henryiii Jul 18, 2024
9aa52a5
style: pre-commit fixes
pre-commit-ci[bot] Jul 18, 2024
a9a9320
fix: require CMake 3.29+ on macos from Python
henryiii Jul 18, 2024
c410273
ci: add pass job for tests
henryiii Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on:
- windows-latest
- ubuntu-latest
- macos-11
- macos-13
python-version:
- '3.12'
- '3.11'
Expand Down Expand Up @@ -256,3 +256,13 @@ jobs:

- name: Test
run: python -m pytest -vv -rs tests -k cppyy


pass-tests:
if: always()
needs: [ run-tests, Linux-ROOT, Linux-cppyy ]
runs-on: ubuntu-latest
steps:
- uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
10 changes: 9 additions & 1 deletion awkward-cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BSD 3-Clause License; see https://github.com/scikit-hep/awkward-1.0/blob/main/LICENSE

cmake_minimum_required(VERSION 3.15...3.26)
cmake_minimum_required(VERSION 3.15...3.30)

# Project must be near the top
project(
Expand All @@ -11,6 +11,14 @@ project(
message(STATUS "CMake version ${CMAKE_VERSION}")
message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")

if(CMAKE_CXX_COMPILER_ID MATCHES AppleClang AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL
15)
if(CMAKE_VERSION VERSION_LESS 3.29)
message(WARNING "CMake should be 3.29+ to support AppleClang 15+. Trying anyway.")
endif()
set(CMAKE_LINKER_TYPE APPLE_CLASSIC)
endif()

# Check for header-only libraries
if(NOT (EXISTS "header-only" AND EXISTS "include/awkward/kernels.h"))
message(
Expand Down
8 changes: 6 additions & 2 deletions awkward-cpp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
"scikit-build-core[pyproject]>=0.2.0",
"scikit-build-core>=0.9",
"pybind11",
]
build-backend = "scikit_build_core.build"
Expand Down Expand Up @@ -59,7 +59,7 @@ Releases = "https://github.com/scikit-hep/awkward-1.0/releases"


[tool.scikit-build]
minimum-version = "0.2"
minimum-version = "0.9"
build-dir = "build/{cache_tag}"
sdist.reproducible = true
sdist.include = [
Expand All @@ -71,3 +71,7 @@ sdist.include = [
"tests-cpu-kernels",
"tests-cpu-kernels-explicit"
]

[[tool.scikit-build.overrides]]
if.platform-system = "darwin"
cmake.version = ">=3.29"
Loading