Skip to content

Commit

Permalink
cmakelists: change qt5 path on macos to qt@5
Browse files Browse the repository at this point in the history
Fix the CI pipeline failing on macOS because Homebrew is always and
forever changing things that worked fine forever.
  • Loading branch information
ripose-jp committed Feb 19, 2024
1 parent 0566191 commit 0a5fb0b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Install Dependencies
run: |
brew update || true
brew install cmake sqlite3 qt5 mpv mecab mecab-ipadic json-c libzip python || true
brew install cmake sqlite3 qt@5 mpv mecab mecab-ipadic json-c libzip python || true
- name: CMake Build
run: |
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,18 @@ if(APPLE AND NOT MAC_CROSSCOMPILE_X86)
MEMENTO_INCLUDE_DIRS

# arm64 locations
"/opt/homebrew/opt/qt5/include"
"/opt/homebrew/opt/qt@5/include"
"/opt/homebrew/include"

# x86_64 locations
"/usr/local/opt/qt5/include/"
"/usr/local/opt/qt@5/include/"
"/usr/local/include"
)
elseif(APPLE AND MAC_CROSSCOMPILE_X86)
# This is a crosscomile target, x86_64 users shouldn't need to use this
set(
MEMENTO_INCLUDE_DIRS
"/usr/local/opt/qt5/include/"
"/usr/local/opt/qt@5/include/"
"/usr/local/include"
)
endif()
Expand Down

0 comments on commit 0a5fb0b

Please sign in to comment.