ci: test fixes for static build on linux

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

Hide file tree

Showing 6 changed files with 23 additions and 256 deletions.
diff --git a/.github/workflows/build.linux.workflow.yml b/.github/workflows/build.linux.workflow.yml
@@ -2,7 +2,7 @@ name: Build Linux
 
 on:
   push:
-    branches: [ master, feature/github-actions ]
+    branches: [ master, feature/github-actions, ci_linux_static ]
   pull_request:
     branches: [ master, feature/github-actions ]
   release:
@@ -18,16 +18,12 @@ jobs:
         os: [ubuntu-20.04]
         arch: [x64]
         config: [Release]
-        statictype: [ON, OFF]
+        statictype: [ON]
         include:
           - statictype: ON
             qtver: Qt6
             host_triplet: release
             release_suffix: static
-          - statictype: OFF
-            qtver: Qt6-Dynamic
-            host_triplet: dynamic
-            release_suffix: shared
 
     steps:
     - name: Checkout Git Repo
@@ -42,7 +38,7 @@ jobs:
     - name: Install dependencies
       run: |
         set -e
-        sudo apt install -y autoconf automake autoconf-archive '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libegl1-mesa-dev
+        sudo apt install -y autoconf automake autoconf-archive '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libegl1-mesa-dev libbsd-dev
 
     - name: Install latest CMake
       uses: lukka/get-cmake@a70f1cfa1857a3eecfe0d34962269e1b1e8be56c # latest as of 2024-08-08

diff --git a/.github/workflows/build.mac.workflow.yml b/.github/workflows/build.mac.workflow.yml
diff --git a/.github/workflows/build.windows.workflow.yml b/.github/workflows/build.windows.workflow.yml
diff --git a/.github/workflows/coverity.workflow.yml b/.github/workflows/coverity.workflow.yml
diff --git a/gui/qt/CMakeLists.txt b/gui/qt/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.21.1)
 
+set(X_VCPKG_FORCE_VCPKG_X_LIBRARIES ON)
+
 option(USE_QT5 "Build with Qt5 instead of Qt6" OFF)
 
 if(USE_QT5)
@@ -275,6 +277,12 @@ else()
     message(WARNING "No LibPNG found! APNG capture will not be available")
 endif()
 
+#if(LINUX AND TRY_STATIC_LIBS)
+#    target_link_libraries(CEmu PRIVATE
+#        -lxcb -lxcb-image
+#    )
+#endif()
+
 target_link_libraries(CEmu PRIVATE
     Qt::Core
     Qt::Gui
@@ -283,6 +291,14 @@ target_link_libraries(CEmu PRIVATE
     Qt::Widgets
 )
 
+if(LINUX AND TRY_STATIC_LIBS)
+    target_link_libraries(CEmu PRIVATE
+        /usr/lib/x86_64-linux-gnu/libXau.a
+        /usr/lib/x86_64-linux-gnu/libXdmcp.a
+        /usr/lib/x86_64-linux-gnu/libbsd.a
+    )
+endif()
+
 include(CheckIPOSupported)
 check_ipo_supported(RESULT lto_supported OUTPUT error)
 if(lto_supported)

diff --git a/gui/qt/vcpkg.json b/gui/qt/vcpkg.json
@@ -38,6 +38,10 @@
           "default-features": false,
           "features": [ "xcb" ],
           "platform": "linux"
+        },
+        {
+          "name": "xcb-image",
+          "platform": "linux"
         }
       ]
     }