Skip to content

Commit

Permalink
gha/macos-homebrew: Fix builds
Browse files Browse the repository at this point in the history
  • Loading branch information
anlambert committed Oct 18, 2024
1 parent 9ef65fd commit fe9787a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos-homebrew-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions cmake/TalipotUseFile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,10 @@ MACRO(TALIPOT_SET_COMPILER_OPTIONS_AND_DEFINITIONS)
"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
SET(CMAKE_CXX_ARCHIVE_FINISH
"<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")

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)
Expand Down

0 comments on commit fe9787a

Please sign in to comment.