From 5555f467f68ce7cdf1060991c24263073b95e9da Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Tue, 23 Jul 2024 20:17:29 +0300 Subject: [PATCH] CMake: fmt, require pw>=1.1.82 --- CMakeLists.txt | 135 +++++++++++++++++++++++++++++++------------------ 1 file changed, 86 insertions(+), 49 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f98bafd..039318f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,39 +3,47 @@ cmake_minimum_required(VERSION 3.19) file(READ ${CMAKE_CURRENT_SOURCE_DIR}/VERSION VER) string(STRIP ${VER} VER) -project(xdg-desktop-portal-hyprland - DESCRIPTION "An XDG-Destop-Portal backend for Hyprland (and wlroots)" - VERSION ${VER} -) +project( + xdg-desktop-portal-hyprland + DESCRIPTION "An XDG-Destop-Portal backend for Hyprland (and wlroots)" + VERSION ${VER}) set(CMAKE_MESSAGE_LOG_LEVEL "STATUS") -set(SYSTEMD_SERVICES ON CACHE BOOL "Install systemd service file") +set(SYSTEMD_SERVICES + ON + CACHE BOOL "Install systemd service file") if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) - message(STATUS "Configuring XDPH in Debug with CMake") - add_compile_definitions(HYPRLAND_DEBUG) + message(STATUS "Configuring XDPH in Debug with CMake") + add_compile_definitions(HYPRLAND_DEBUG) else() - add_compile_options(-O3) - message(STATUS "Configuring XDPH in Release with CMake") + add_compile_options(-O3) + message(STATUS "Configuring XDPH in Release with CMake") endif() -include_directories( - . - "protocols/" -) +include_directories(. "protocols/") # configure include(GNUInstallDirs) set(LIBEXECDIR ${CMAKE_INSTALL_FULL_LIBEXECDIR}) -configure_file(org.freedesktop.impl.portal.desktop.hyprland.service.in org.freedesktop.impl.portal.desktop.hyprland.service @ONLY) +configure_file(org.freedesktop.impl.portal.desktop.hyprland.service.in + org.freedesktop.impl.portal.desktop.hyprland.service @ONLY) if(SYSTEMD_SERVICES) - configure_file(contrib/systemd/xdg-desktop-portal-hyprland.service.in contrib/systemd/xdg-desktop-portal-hyprland.service @ONLY) + configure_file(contrib/systemd/xdg-desktop-portal-hyprland.service.in + contrib/systemd/xdg-desktop-portal-hyprland.service @ONLY) endif() set(CMAKE_CXX_STANDARD 23) -add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value - -Wno-missing-field-initializers -Wno-narrowing -Wno-pointer-arith - $<$:-fpermissive> -Wno-address-of-temporary) +add_compile_options( + -Wall + -Wextra + -Wno-unused-parameter + -Wno-unused-value + -Wno-missing-field-initializers + -Wno-narrowing + -Wno-pointer-arith + $<$:-fpermissive> + -Wno-address-of-temporary) # dependencies message(STATUS "Checking deps...") @@ -43,27 +51,40 @@ add_subdirectory(hyprland-share-picker) find_package(Threads REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols wayland-scanner libpipewire-0.3 libspa-0.2 libdrm gbm hyprlang>=0.2.0) +pkg_check_modules( + deps + REQUIRED + IMPORTED_TARGET + wayland-client + wayland-protocols + wayland-scanner + libpipewire-0.3>=1.1.82 + libspa-0.2 + libdrm + gbm + hyprlang>=0.2.0) # check whether we can find sdbus-c++ through pkg-config pkg_check_modules(SDBUS IMPORTED_TARGET sdbus-c++) if(NOT SDBUS_FOUND) - include_directories("subprojects/sdbus-cpp/include/") - add_subdirectory(subprojects/sdbus-cpp EXCLUDE_FROM_ALL) - add_library(PkgConfig::SDBUS ALIAS sdbus-c++) + include_directories("subprojects/sdbus-cpp/include/") + add_subdirectory(subprojects/sdbus-cpp EXCLUDE_FROM_ALL) + add_library(PkgConfig::SDBUS ALIAS sdbus-c++) endif() # same for hyprland-protocols pkg_check_modules(HYPRLAND_PROTOS IMPORTED_TARGET hyprland-protocols) if(HYPRLAND_PROTOS_FOUND) - set(HYPRLAND_PROTOCOLS "${HYPRLAND_PROTOS_PREFIX}/share/hyprland-protocols") + set(HYPRLAND_PROTOCOLS "${HYPRLAND_PROTOS_PREFIX}/share/hyprland-protocols") else() - set(HYPRLAND_PROTOCOLS "subprojects/hyprland-protocols") + set(HYPRLAND_PROTOCOLS "subprojects/hyprland-protocols") endif() file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp") add_executable(xdg-desktop-portal-hyprland ${SRCFILES}) -target_link_libraries(xdg-desktop-portal-hyprland PRIVATE rt PkgConfig::SDBUS Threads::Threads PkgConfig::deps) +target_link_libraries( + xdg-desktop-portal-hyprland PRIVATE rt PkgConfig::SDBUS Threads::Threads + PkgConfig::deps) # protocols pkg_get_variable(WaylandScanner wayland-scanner wayland_scanner) @@ -72,35 +93,51 @@ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}") function(protocol protoPath protoName external) - if (external) - set(path ${protoPath}) - else() - set(path ${WAYLAND_PROTOCOLS_DIR}/${protoPath}) - endif() - add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.h - COMMAND ${WaylandScanner} client-header ${path} ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.h - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) - add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.c - COMMAND ${WaylandScanner} private-code ${path} ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.c - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) - target_sources(xdg-desktop-portal-hyprland PRIVATE protocols/${protoName}-protocol.h) - target_sources(xdg-desktop-portal-hyprland PRIVATE protocols/${protoName}-protocol.c) + if(external) + set(path ${protoPath}) + else() + set(path ${WAYLAND_PROTOCOLS_DIR}/${protoPath}) + endif() + add_custom_command( + OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.h + COMMAND ${WaylandScanner} client-header ${path} + ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.h + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + add_custom_command( + OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.c + COMMAND ${WaylandScanner} private-code ${path} + ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.c + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + target_sources(xdg-desktop-portal-hyprland + PRIVATE protocols/${protoName}-protocol.h) + target_sources(xdg-desktop-portal-hyprland + PRIVATE protocols/${protoName}-protocol.c) endfunction() -protocol("protocols/wlr-foreign-toplevel-management-unstable-v1.xml" "wlr-foreign-toplevel-management-unstable-v1" true) -protocol("protocols/wlr-screencopy-unstable-v1.xml" "wlr-screencopy-unstable-v1" true) -protocol("${HYPRLAND_PROTOCOLS}/protocols/hyprland-global-shortcuts-v1.xml" "hyprland-global-shortcuts-v1" true) -protocol("${HYPRLAND_PROTOCOLS}/protocols/hyprland-toplevel-export-v1.xml" "hyprland-toplevel-export-v1" true) -protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" "linux-dmabuf-unstable-v1" false) +protocol("protocols/wlr-foreign-toplevel-management-unstable-v1.xml" + "wlr-foreign-toplevel-management-unstable-v1" true) +protocol("protocols/wlr-screencopy-unstable-v1.xml" + "wlr-screencopy-unstable-v1" true) +protocol("${HYPRLAND_PROTOCOLS}/protocols/hyprland-global-shortcuts-v1.xml" + "hyprland-global-shortcuts-v1" true) +protocol("${HYPRLAND_PROTOCOLS}/protocols/hyprland-toplevel-export-v1.xml" + "hyprland-toplevel-export-v1" true) +protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" + "linux-dmabuf-unstable-v1" false) # Installation install(TARGETS hyprland-share-picker) -install(TARGETS xdg-desktop-portal-hyprland DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) +install(TARGETS xdg-desktop-portal-hyprland + DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) -install(FILES hyprland.portal DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xdg-desktop-portal/portals") -install(FILES ${CMAKE_BINARY_DIR}/org.freedesktop.impl.portal.desktop.hyprland.service DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services") +install(FILES hyprland.portal + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xdg-desktop-portal/portals") +install( + FILES ${CMAKE_BINARY_DIR}/org.freedesktop.impl.portal.desktop.hyprland.service + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services") if(SYSTEMD_SERVICES) - install(FILES ${CMAKE_BINARY_DIR}/contrib/systemd/xdg-desktop-portal-hyprland.service DESTINATION "lib/systemd/user") + install( + FILES + ${CMAKE_BINARY_DIR}/contrib/systemd/xdg-desktop-portal-hyprland.service + DESTINATION "lib/systemd/user") endif()