ci/macos

.github/workflows/wheel.yml

@@ -12,15 +12,16 @@ jobs:
         sys:
           - { os: windows-2019, shell: "msys2 {0}" }
           - { os: ubuntu-20.04, shell: bash }
-          - { os: macos-11, shell: bash }
+          - { os: macos-13, shell: bash }
+          - { os: macos-14, shell: bash }
     defaults:
       run:
         shell: ${{ matrix.sys.shell }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - if: runner.os == 'Windows'
         uses: msys2/setup-msys2@v2

CMakeLists.txt

@@ -111,12 +111,6 @@ add_executable(${BIN_NAME} ${SRC_FILES} ${fpm_src_SOURCE_DIR}/app/main.f90)
 # version preproc tag was added in fpm 0.8.2
 target_compile_definitions(${BIN_NAME} PRIVATE FPM_RELEASE_VERSION=${FPM_VERSION})
 
-# HACK: circumvent compiler's default preprocessor heuristic and enable it
-# globally. This is to circumvent sr/fpm/fpm_release.f90 erroneous lowecase
-# file extension.
-# Remove in the next fpm release
-target_compile_options(${BIN_NAME} PRIVATE "-cpp")
-
 if(OpenMP_Fortran_FOUND)
   message(STATUS "OpenMP Fortran found: Building fpm for parallel execution")
   target_link_libraries(${BIN_NAME} PUBLIC OpenMP::OpenMP_Fortran)

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=67.0.0",
+    "setuptools>=75.0.0",
     "scikit-build>=0.16.7",
     "cmake>=3.20.0",
     "ninja",
@@ -38,23 +38,12 @@ bug-tracker = "https://github.com/fortran-lang/fpm/issues"
 write_to = "src/fpm/_version.py"
 
 [tool.cibuildwheel]
-build = "cp310-*"
-build-verbosity = "3"
+build = "cp312-*"
+build-verbosity = 3
 
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]
-environment = { CC = "clang", CXX = "clang++", FC = "gfortran-11" }
-
-[[tool.cibuildwheel.overrides]]
-select = "*-macosx_arm64"
-before-build = "bash {project}/tools/wheels/cibw_before_build_macos.sh {project}"
-
-# Override the default environment variables with the cross-compiled ones
-[tool.cibuildwheel.overrides.environment]
-CC = "clang"
-CXX = "clang++"
-FC = "/opt/gfortran-darwin-arm64-cross/bin/arm64-apple-darwin20.0.0-gfortran"
-LDFLAGS = "-L/opt/gfortran-darwin-arm64-cross/lib/gcc/arm64-apple-darwin20.0.0/11.3.0 -Wl,-rpath,/opt/gfortran-darwin-arm64-cross/lib/gcc/arm64-apple-darwin20.0.0/11.3.0"
+environment = { CC = "clang", CXX = "clang++", FC = "gfortran-12" }
 
 [tool.cibuildwheel.windows]
 archs = ["auto64"]