Fix wheel building on MacOS 14 and sync up conan version in wheels and conda (#3522)

MridulS · web-flow · commit 88661b110ba9 · 2024-08-19T09:33:40.000+02:00
* try builds on macos-12

* use ld_classic for macos

* bump up to macos-13/14

* use intel and arm runners

* sync up tbb from conan with conda

* cleanup

* bump up min MACOSX_DEPLOYMENT_TARGET

* sync up min CMAKE_OSX_DEPLOYMENT_TARGET

* sync up DCMAKE_OSX_DEPLOYMENT_TARGET

* typo

* build all

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update release.yml
diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
@@ -26,7 +26,7 @@ jobs:
     - uses: pypa/cibuildwheel@v2.20.0
       env:
         CIBW_BUILD: ${{ inputs.build }}-*
-        MACOSX_DEPLOYMENT_TARGET: "10.15"
+        MACOSX_DEPLOYMENT_TARGET: "11.0"
 
     - name: Verify clean directory
       run: git diff --exit-code
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,12 @@ if(SKBUILD)
     VERSION ${SKBUILD_PROJECT_VERSION}
     LANGUAGES CXX
   )
+  # AppleClang 15 changed linking order
+  # https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Linking
+  if(APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0)
+    message(STATUS "Building on macOS with Clang 15 or newer")
+    add_link_options("-ld_classic")
+  endif()
   add_definitions(-DSCIPP_VERSION="${SKBUILD_PROJECT_VERSION_FULL}")
   message(STATUS "Got version from SKBUILD: ${SKBUILD_PROJECT_VERSION_FULL}")
 else()
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -33,7 +33,7 @@
       "inherits": "base",
       "description": "MacOS options for CI build (PR and Main)",
       "cacheVariables": {
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "10.15"
+        "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0"
       }
     },
     {
@@ -69,7 +69,7 @@
       "inherits": "package",
       "description": "MacOS options for package build for x86_64",
       "cacheVariables": {
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "10.15",
+        "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
         "CMAKE_OSX_ARCHITECTURES": "x86_64"
       }
     },
@@ -173,4 +173,4 @@
       }
     }
   ]
-}
+}
diff --git a/conda/cmake-package-test/build.py b/conda/cmake-package-test/build.py
@@ -20,7 +20,7 @@
 
 if sys.platform == 'darwin':
     cmake_flags.append(
-        f'-DCMAKE_OSX_DEPLOYMENT_TARGET={os.getenv("OSX_VERSION", "10.14")}'
+        f'-DCMAKE_OSX_DEPLOYMENT_TARGET={os.getenv("OSX_VERSION", "11.0")}'
     )
 elif sys.platform == 'win32':
     cmake_flags.extend(['-G', 'Visual Studio 16 2019'])
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -17,15 +17,6 @@ option(BENCHMARK "Enable benchmarks" OFF)
 
 include(scipp-conan)
 
-# Currently, scikit-build does not support FindPython.
-if(SKBUILD)
-  set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
-  set(Python_INCLUDE_DIR "${PYTHON_INCLUDE_DIR}")
-  unset(PYTHON_EXECUTABLE)
-  unset(PYTHON_INCLUDE_DIR)
-  unset(PYTHON_LIBRARY)
-  unset(PYTHON_VERSION_STRING)
-endif()
 set(Python_FIND_IMPLEMENTATIONS CPython PyPy)
 
 find_package(Benchmark)
diff --git a/lib/cmake/scipp-conan.cmake b/lib/cmake/scipp-conan.cmake
@@ -31,7 +31,7 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR})
 option(CONAN_TBB "Use TBB from conan" OFF)
 if(SKBUILD OR CONAN_TBB)
   # Conda builds install tbb via conda, not conan
-  set(CONAN_ONETBB onetbb/2021.7.0)
+  set(CONAN_ONETBB onetbb/2021.12.0)
   # The deploy generator is used to install dependencies into a know location.
   # The RUNTIME_DEPENDENCIES DIRECTORIES install option is then used to find the
   # dependencies. This is actually required only for Windows, since on Linux and
diff --git a/pyproject.toml b/pyproject.toml
@@ -84,9 +84,6 @@ test-command = "pytest --ignore {project}/tests/plotting --ignore {project}/test
 skip = ["pp*", "*musllinux*"]
 build-verbosity = 1
 
-[tool.cibuildwheel.macos]
-archs = ["x86_64", "arm64"]
-
 [tool.bandit.assert_used]
 skips = [
   "*/*_test.py",

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`"inherits": "base",`
`34`	`34`	`"description": "MacOS options for CI build (PR and Main)",`
`35`	`35`	`"cacheVariables": {`
`36`		`- "CMAKE_OSX_DEPLOYMENT_TARGET": "10.15"`
	`36`	`+ "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0"`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`{`
`@@ -69,7 +69,7 @@`
`69`	`69`	`"inherits": "package",`
`70`	`70`	`"description": "MacOS options for package build for x86_64",`
`71`	`71`	`"cacheVariables": {`
`72`		`- "CMAKE_OSX_DEPLOYMENT_TARGET": "10.15",`
	`72`	`+ "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",`
`73`	`73`	`"CMAKE_OSX_ARCHITECTURES": "x86_64"`
`74`	`74`	`}`
`75`	`75`	`},`
`@@ -173,4 +173,4 @@`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`]`
`176`		`-}`
	`176`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`if sys.platform == 'darwin':`
`22`	`22`	`cmake_flags.append(`
`23`		`- f'-DCMAKE_OSX_DEPLOYMENT_TARGET={os.getenv("OSX_VERSION", "10.14")}'`
	`23`	`+ f'-DCMAKE_OSX_DEPLOYMENT_TARGET={os.getenv("OSX_VERSION", "11.0")}'`
`24`	`24`	`)`
`25`	`25`	`elif sys.platform == 'win32':`
`26`	`26`	`cmake_flags.extend(['-G', 'Visual Studio 16 2019'])`