ci: linux: Add xcb feature as qtbase dependency

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

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/gui/qt/CMakeLists.txt b/gui/qt/CMakeLists.txt
@@ -295,10 +295,7 @@ else()
     message(STATUS "IPO/LTO not supported: <${error}>")
 endif()
 
-target_compile_definitions(CEmu PRIVATE $<$<CONFIG:Release>:QT_NO_DEBUG_OUTPUT>)
-if(CMAKE_BUILD_TYPE STREQUAL Release OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
-    target_compile_definitions(CEmu PRIVATE QT_NO_DEBUG_OUTPUT)
-endif()
+target_compile_definitions(CEmu PRIVATE $<$<CONFIG:Release,RelWithDebInfo>:QT_NO_DEBUG_OUTPUT>)
 
 if(UNIX OR APPLE)
     target_sources(CEmu PUBLIC ../../core/os/os-linux.c)

diff --git a/gui/qt/vcpkg.json b/gui/qt/vcpkg.json
@@ -32,6 +32,12 @@
           "name": "qtbase",
           "default-features": false,
           "features": [ "dbus", "gui", "network", "widgets", "png" ]
+        },
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [ "xcb" ],
+          "platform": "linux"
         }
       ]
     }