From a82b1149803322e76f4fcdb40df6a773bdfa8a58 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 19 Feb 2022 16:20:08 +0400 Subject: [PATCH] Generate pkg-config file manually for wayland-protocols Meson is unneeded that way --- external/kwayland/CMakeLists.txt | 25 ++++++----------------- external/kwayland/wayland-protocols.pc.in | 5 +++++ 2 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 external/kwayland/wayland-protocols.pc.in diff --git a/external/kwayland/CMakeLists.txt b/external/kwayland/CMakeLists.txt index 2630bc1..2abc96e 100644 --- a/external/kwayland/CMakeLists.txt +++ b/external/kwayland/CMakeLists.txt @@ -38,23 +38,11 @@ ExternalProject_Add(extra-cmake-modules ExternalProject_Get_property(extra-cmake-modules BINARY_DIR) set(extra_cmake_modules_binary_dir ${BINARY_DIR}) -ExternalProject_Add(wayland-protocols - URL ${third_party_loc}/wayland-protocols - CONFIGURE_COMMAND meson - --prefix= - --libdir=lib - --buildtype=release - -Dtests=false - - BUILD_COMMAND meson compile -C - COMMAND meson install -C - STEP_TARGETS build - EXCLUDE_FROM_ALL TRUE - BUILD_BYPRODUCTS /share/pkgconfig/wayland-protocols.pc -) - -ExternalProject_Get_property(wayland-protocols BINARY_DIR) -set(wayland_protocols_binary_dir ${BINARY_DIR}) +set(wayland_protocols_source_dir ${third_party_loc}/wayland-protocols) +file(READ "${wayland_protocols_source_dir}/meson.build" wayland_protocols_meson_build) +string(REGEX MATCH "\n[ \t]*version: '([0-9.]+)'" _ ${wayland_protocols_meson_build}) +set(wayland_protocols_version ${CMAKE_MATCH_1}) +configure_file("wayland-protocols.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/share/pkgconfig/wayland-protocols.pc" @ONLY) ExternalProject_Add(plasma-wayland-protocols URL ${third_party_loc}/plasma-wayland-protocols @@ -85,7 +73,7 @@ ExternalProject_Add(kwayland -DBUILD_TESTING=OFF -DBUILD_WITH_QT6=${DESKTOP_APP_QT6} -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.91.0 - -DCMAKE_PREFIX_PATH=${wayland_protocols_binary_dir} + -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR} -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake -DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols STEP_TARGETS build @@ -94,7 +82,6 @@ ExternalProject_Add(kwayland ) ExternalProject_Add_StepDependencies(kwayland configure extra-cmake-modules-build) -ExternalProject_Add_StepDependencies(kwayland configure wayland-protocols-build) ExternalProject_Add_StepDependencies(kwayland configure plasma-wayland-protocols-build) ExternalProject_Get_property(kwayland SOURCE_DIR) diff --git a/external/kwayland/wayland-protocols.pc.in b/external/kwayland/wayland-protocols.pc.in new file mode 100644 index 0000000..abb3894 --- /dev/null +++ b/external/kwayland/wayland-protocols.pc.in @@ -0,0 +1,5 @@ +pkgdatadir=@wayland_protocols_source_dir@ + +Name: Wayland Protocols +Description: Wayland protocol files +Version: @wayland_protocols_version@