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 CodeQL script #1058

Merged
merged 5 commits into from
Jan 21, 2025
Merged

Fix CodeQL script #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e22e30
Add g++
awawa-dev Jan 16, 2025
278a6bf
Update action.yml
awawa-dev Jan 16, 2025
37401e0
Fix fPIC
awawa-dev Jan 21, 2025
82abe0b
Fix upload-to-github-pages.yml
awawa-dev Jan 21, 2025
d7e41d4
Update installers.cmake
awawa-dev Jan 21, 2025
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
20 changes: 11 additions & 9 deletions .github/actions/codeql/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,29 @@ runs:
build-essential \
cmake \
git \
libgtk-3-dev \
libayatana-appindicator3-dev \
libasound2-dev \
libegl-dev \
libftdi-dev \
libflatbuffers-dev flatbuffers-compiler \
libftdi1-dev \
libgl-dev \
libglvnd-dev \
liblzma-dev \
libpipewire-0.3-dev \
libqt5serialport5-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
libqt5x11extras5-dev \
libssl-dev \
libsystemd-dev \
libturbojpeg0-dev \
libusb-1.0-0-dev \
libx11-dev \
libzstd-dev \
nasm \
python3-minimal \
pkg-config \
qtbase5-dev \
qdbus-qt5 \
rpm \
libsystemd-dev
wget \
unzip \
pkg-config \
python3

- name: Checkout repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-to-github-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
niceName: [ Debian ]
linuxVersion: [ bullseye, bookworm ]
dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
dockerImage: [ x86_64, arm-32bit-armv6l-native, arm-64bit-aarch64-native ]
include:
- runner: ubuntu-24.04
dockerImage: x86_64
Expand Down
3 changes: 3 additions & 0 deletions cmake/installers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
macro(DeployApple TARGET)
if(EXISTS ${TARGET_FILE})
cmake_policy(PUSH)
cmake_policy(SET CMP0177 NEW)
install ( TARGETS hyperhdr DESTINATION "share/.." COMPONENT "HyperHDR" )
cmake_policy(POP)

install(FILES "${PROJECT_SOURCE_DIR}/cmake/osx/Hyperhdr.icns" DESTINATION "hyperhdr.app/Contents/Resources" COMPONENT "HyperHDR")
install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION "hyperhdr.app/Contents/Resources" COMPONENT "HyperHDR")
Expand Down
1 change: 1 addition & 0 deletions external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ if ( ENABLE_XZ )
option(BUILD_TESTING "" OFF)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/xz)
set_target_properties(liblzma PROPERTIES INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/xz/src/liblzma/api>)
set_property(TARGET liblzma PROPERTY POSITION_INDEPENDENT_CODE ON)
add_library(LibLZMA::LibLZMA ALIAS liblzma)
endif()
ENDIF()
Expand Down
Loading