From fe9787aa69abe385c471e41c00d6f75e247dbf69 Mon Sep 17 00:00:00 2001 From: Antoine Lambert Date: Fri, 18 Oct 2024 21:48:26 +0200 Subject: [PATCH] gha/macos-homebrew: Fix builds --- .github/workflows/macos-homebrew-build.yml | 4 ++-- cmake/TalipotUseFile.cmake | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-homebrew-build.yml b/.github/workflows/macos-homebrew-build.yml index 5c34a52aa9..eba5888443 100644 --- a/.github/workflows/macos-homebrew-build.yml +++ b/.github/workflows/macos-homebrew-build.yml @@ -8,8 +8,8 @@ jobs: fail-fast: false matrix: config: - - name: Talipot build on macOS 12 (x86_64) - os: macos-12 + - name: Talipot build on macOS 13 (x86_64) + os: macos-13 pyver: "3.12" homebrew_path: /usr/local - name: Talipot build on macOS 14 (arm64) diff --git a/cmake/TalipotUseFile.cmake b/cmake/TalipotUseFile.cmake index b5207659d5..25bea58c9e 100644 --- a/cmake/TalipotUseFile.cmake +++ b/cmake/TalipotUseFile.cmake @@ -399,6 +399,10 @@ MACRO(TALIPOT_SET_COMPILER_OPTIONS_AND_DEFINITIONS) " -no_warning_for_no_symbols -c ") SET(CMAKE_CXX_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") + + IF(CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18.0) + LINK_LIBRARIES("/opt/homebrew/opt/llvm/lib/libunwind.dylib") + ENDIF(CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18.0) ENDIF(APPLE) IF(CMAKE_COMPILER_IS_GNUCXX AND TALIPOT_CODE_COVERAGE)