Skip to content

Commit 97b138d

Browse files
authored
Fix CodeQL script (#1058)
* Add g++ * Update action.yml * Fix fPIC * Fix upload-to-github-pages.yml * Update installers.cmake
1 parent 1fcfcae commit 97b138d

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

Diff for: .github/actions/codeql/action.yml

+11-9
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,29 @@ runs:
2626
build-essential \
2727
cmake \
2828
git \
29+
libgtk-3-dev \
30+
libayatana-appindicator3-dev \
2931
libasound2-dev \
3032
libegl-dev \
31-
libftdi-dev \
33+
libflatbuffers-dev flatbuffers-compiler \
34+
libftdi1-dev \
3235
libgl-dev \
3336
libglvnd-dev \
37+
liblzma-dev \
3438
libpipewire-0.3-dev \
3539
libqt5serialport5-dev \
36-
libqt5sql5-sqlite \
37-
libqt5svg5-dev \
38-
libqt5x11extras5-dev \
3940
libssl-dev \
41+
libsystemd-dev \
4042
libturbojpeg0-dev \
4143
libusb-1.0-0-dev \
4244
libx11-dev \
4345
libzstd-dev \
44-
nasm \
45-
python3-minimal \
46+
pkg-config \
4647
qtbase5-dev \
47-
qdbus-qt5 \
48-
rpm \
49-
libsystemd-dev
48+
wget \
49+
unzip \
50+
pkg-config \
51+
python3
5052
5153
- name: Checkout repository
5254
uses: actions/checkout@v4

Diff for: .github/workflows/upload-to-github-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
niceName: [ Debian ]
2323
linuxVersion: [ bullseye, bookworm ]
24-
dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
24+
dockerImage: [ x86_64, arm-32bit-armv6l-native, arm-64bit-aarch64-native ]
2525
include:
2626
- runner: ubuntu-24.04
2727
dockerImage: x86_64

Diff for: cmake/installers.cmake

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
macro(DeployApple TARGET)
22
if(EXISTS ${TARGET_FILE})
3+
cmake_policy(PUSH)
4+
cmake_policy(SET CMP0177 NEW)
35
install ( TARGETS hyperhdr DESTINATION "share/.." COMPONENT "HyperHDR" )
6+
cmake_policy(POP)
47

58
install(FILES "${PROJECT_SOURCE_DIR}/cmake/osx/Hyperhdr.icns" DESTINATION "hyperhdr.app/Contents/Resources" COMPONENT "HyperHDR")
69
install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION "hyperhdr.app/Contents/Resources" COMPONENT "HyperHDR")

Diff for: external/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ if ( ENABLE_XZ )
246246
option(BUILD_TESTING "" OFF)
247247
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/xz)
248248
set_target_properties(liblzma PROPERTIES INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/external/xz/src/liblzma/api>)
249+
set_property(TARGET liblzma PROPERTY POSITION_INDEPENDENT_CODE ON)
249250
add_library(LibLZMA::LibLZMA ALIAS liblzma)
250251
endif()
251252
ENDIF()

0 commit comments

Comments
 (0)