ci: linux: Use static libpng-apng in dynamic build

CE-Programming · Aug 9, 2024 · 895bb98 · 895bb98
1 parent 654259d
commit 895bb98
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/build.linux.workflow.yml b/.github/workflows/build.linux.workflow.yml
@@ -26,7 +26,7 @@ jobs:
             release_suffix: static
           - statictype: OFF
             qtver: Qt6-Dynamic
-            host_triplet: dynamic
+            host_triplet: dynamic-apng
             release_suffix: shared
 
     steps:

diff --git a/gui/qt/CMakePresets.json b/gui/qt/CMakePresets.json
@@ -22,6 +22,10 @@
           "type": "BOOL",
           "value": "True"
         },
+        "VCPKG_OVERLAY_TRIPLETS": {
+          "type": "STRING",
+          "value": "${sourceDir}/triplets"
+        },
         "TRY_STATIC_LIBS": {
           "type": "BOOL",
           "value": "ON"
@@ -148,7 +152,7 @@
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": {
           "type": "STRING",
-          "value": "x64-linux-dynamic"
+          "value": "x64-linux-dynamic-apng"
         },
         "TRY_STATIC_LIBS": {
           "type": "BOOL",

diff --git a/gui/qt/triplets/x64-linux-dynamic-apng.cmake b/gui/qt/triplets/x64-linux-dynamic-apng.cmake
@@ -0,0 +1,10 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+if(PORT STREQUAL "png")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+
+set(VCPKG_FIXUP_ELF_RPATH ON)