ci: linux: Fix static build

CE-Programming · Aug 9, 2024 · 314ef4b · 314ef4b
1 parent d934c67
commit 314ef4b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/build.linux.workflow.yml b/.github/workflows/build.linux.workflow.yml
@@ -22,7 +22,7 @@ jobs:
         include:
           - statictype: ON
             qtver: Qt6
-            host_triplet: release
+            host_triplet: static-xcb-release
             release_suffix: static
           - statictype: OFF
             qtver: Qt6-Dynamic

diff --git a/gui/qt/CMakeLists.txt b/gui/qt/CMakeLists.txt
@@ -51,6 +51,7 @@ if(TRY_STATIC_LIBS)
 endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_SKIP_RPATH TRUE)
 
 set(USED_CMAKE_GENERATOR "${CMAKE_GENERATOR}" CACHE STRING "Expose CMAKE_GENERATOR" FORCE)
 message(STATUS "Detected system: ${CMAKE_SYSTEM_NAME} - host processor: ${CMAKE_HOST_SYSTEM_PROCESSOR} - CXX_COMPILER: ${CMAKE_CXX_COMPILER_ID}")

diff --git a/gui/qt/CMakePresets.json b/gui/qt/CMakePresets.json
@@ -142,7 +142,7 @@
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": {
           "type": "STRING",
-          "value": "x64-linux"
+          "value": "x64-linux-static-xcb"
         }
       }
     },

diff --git a/gui/qt/triplets/x64-linux-static-xcb-release.cmake b/gui/qt/triplets/x64-linux-static-xcb-release.cmake
@@ -0,0 +1,11 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+if(PORT MATCHES "^(xcb.*|libxau|libxdmcp|xorg-macros)$")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+    set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
+    set(VCPKG_FIXUP_ELF_RPATH ON)
+endif()
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+set(VCPKG_BUILD_TYPE release)
diff --git a/gui/qt/triplets/x64-linux-static-xcb.cmake b/gui/qt/triplets/x64-linux-static-xcb.cmake
@@ -0,0 +1,10 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+if(PORT MATCHES "^(xcb.*|libxau|libxdmcp|xorg-macros)$")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+    set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
+    set(VCPKG_FIXUP_ELF_RPATH ON)
+endif()
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
diff --git a/gui/qt/vcpkg.json b/gui/qt/vcpkg.json
@@ -36,8 +36,12 @@
         {
           "name": "qtbase",
           "default-features": false,
-          "features": [ "xcb" ],
+          "features": [ "fontconfig", "xcb" ],
           "platform": "linux"
+        },
+        {
+          "name": "xcb-image",
+          "platform": "linux & static"
         }
       ]
     }