Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macOS build #638

Merged
merged 4 commits into from
Sep 14, 2023
Merged

Fix macOS build #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acb3d1b
fix zstd
awawa-dev Sep 13, 2023
573e4a4
Add webp
awawa-dev Sep 13, 2023
7ddc7b5
Force libsharpyuv.0.dylib into the package
awawa-dev Sep 13, 2023
bf771cf
Final fix
awawa-dev Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/push-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
# Install deps
- name: Install deps
shell: bash
run: brew install qt@${{ env.QT_VERSION }} xz ccache
run: brew update && brew install qt@${{ env.QT_VERSION }} xz ccache zstd webp

# Set env
- name: Set QT5 env
Expand Down
10 changes: 9 additions & 1 deletion cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,15 @@ macro(DeployApple TARGET)
TYPE SHARED_LIBRARY
FOLLOW_SYMLINK_CHAIN
FILES "/usr/local/lib/libbrotlicommon.1.dylib")
endif()
endif()

if (EXISTS "/usr/local/lib/libsharpyuv.0.dylib")
file(INSTALL
DESTINATION "${CMAKE_INSTALL_PREFIX}/hyperhdr.app/Contents/lib"
TYPE SHARED_LIBRARY
FOLLOW_SYMLINK_CHAIN
FILES "/usr/local/lib/libsharpyuv.0.dylib")
endif()

list(LENGTH _u_deps _u_length)
if("${_u_length}" GREATER 0)
Expand Down