Fix CodeQL script (#1058)

* Add g++ * Update action.yml * Fix fPIC * Fix upload-to-github-pages.yml * Update installers.cmake
awawa-dev · Jan 21, 2025 · 97b138d · 97b138d
1 parent 1fcfcae
commit 97b138d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.github/actions/codeql/action.yml b/.github/actions/codeql/action.yml
@@ -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

diff --git a/.github/workflows/upload-to-github-pages.yml b/.github/workflows/upload-to-github-pages.yml
@@ -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

diff --git a/cmake/installers.cmake b/cmake/installers.cmake
@@ -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")

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -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()