Enable wayland support automatically if all libraries are available instead of having an individual switch

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2023-05-07 21:19:28 +02:00
parent 660f798d9a
commit af72b8163b
2 changed files with 11 additions and 13 deletions

View File

@ -53,7 +53,7 @@ jobs:
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_WAYLAND=True
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build
# Build your program with the given configuration

View File

@ -44,11 +44,10 @@ include_directories(
${CMAKE_SOURCE_DIR}
include)
if (ENABLE_WAYLAND)
message(STATUS "Wayland support is enabled!")
pkg_check_modules(wayland-cursor wayland-protocols egl wayland-egl)
# try to enable wayland builds when possible
pkg_check_modules(WAYLAND_SUPPORT wayland-cursor wayland-protocols egl wayland-egl)
if(WAYLAND_SUPPORT_FOUND)
find_program(WaylandScanner NAMES wayland-scanner)
message(STATUS "Found WaylandScanner at ${WaylandScanner}")
execute_process(
@ -86,8 +85,6 @@ if (ENABLE_WAYLAND)
"src/WallpaperEngine/Input/Drivers/CWaylandMouseInput.h"
"xdg-shell-protocol.c"
"wlr-layer-shell-unstable-v1-protocol.c")
else()
set(WAYLAND_SOURCES "")
endif()
add_executable(
@ -341,8 +338,9 @@ target_link_libraries(linux-wallpaperengine
${PULSEAUDIO_LIBRARY}
glfw)
if (ENABLE_WAYLAND)
target_link_libraries(linux-wallpaperengine pthread
if (WAYLAND_SUPPORT_FOUND)
target_link_libraries(linux-wallpaperengine
pthread
wayland-cursor
wayland-client
wayland-egl