mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-16 04:19:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3203d48203
vcpkg/ports/kf5guiaddons/fix_cmake.patch

13 lines
590 B
Diff
Raw Normal View History

[kf5guiaddons] fix Wayland scanner not being found by transitive deps; fix static builds (#19203) * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE variable to Config.cmake * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous options * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous lines, bump version * [kf5guiaddons] update versions * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE to MAYBE_UNUSED_VARIABLES * [kf5guiaddons] update versions * [kf5guiaddons] replace CURRENT_INSTALLED_DIR without affecting other vars * [kf5guiaddons] update deprecated functions * [kf5guiaddons] wrap paths in quotes * [kf5guiaddons] update versions * [kf5guiaddons] use PACKAGE_PREFIX relative path instead CURRENT_PACKAGES_DIR * [kf5guiaddons] update versions * [kf5guiaddons] cache the QtWaylandScanner_EXECUTABLE variable * [kf5guiaddons] update versions * [kf5guiaddons] update versions * [kf5guiaddons] Add missing static dependency * [kf5guiaddons] update versions * [kf5guiaddons] rename patch file * [kf5guiaddons] update versions * [kf5guiaddons] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5guiaddons] update versions
2021-08-31 01:04:04 +08:00
diff --git a/KF5GuiAddonsConfig.cmake.in b/KF5GuiAddonsConfig.cmake.in
index ae17f6b..34e41bd 100644
--- a/KF5GuiAddonsConfig.cmake.in
+++ b/KF5GuiAddonsConfig.cmake.in
@@ -10,6 +10,7 @@ if (NOT @BUILD_SHARED_LIBS@)
[kf5] Update to 5.98 (#26831) * [kf5] upgrade to 5.98 * [kf5] update versions * [plasma-wayland-protocols] new port * [plasma-wayland-protocols] update versions * [kf5guiaddons] add wayland dependency; make x11 a feature * [kf5guiaddons] update versions * [kf5auth] kauth has no support for Windows * [kf5auth] update versions * [kf5configwidgets] kauth has no support for Windows nor Android * [kf5configwidgets] update version * [kf5auth] add static dependencies * [kf5auth] update versions * [kf5globalaccel] globalaccel has no support for Windows * [kf5declarative] globalaccel has no support for Windows * [kf5] update versions * [kf5guiaddons] copy the kde-geo-uri-handler tool * [kf5guiaddons] update versions * [kf5kcmutils] fix QML files installation location * [kf5kcmutils] update versions * [kf5newstuff] fix unused variable warning * [kf5newstuff] update versions * [kf5coreaddons] fix static builds * [kf5coreaddons] update versions * [kf5kcmutils] copy kcmdesktopfilegenerator tool * [kf5kcmutils] update versions * [kf5kio] update libiconv patch * [kf5kio] update versions * [kf5globalaccel] add XCB dependncy on Linux * [kf5globalaccel] update versions * [kf5configwidgets] add coreaddons as new dependency * [kf5configwidgets] update version * [kf5kcmutils] update static compilation patch * [kf5kcmutils] update versions * [kf5auth] fix static dependencies * [kf5auth] update versions * [kf5auth] update cmake.in static deps patch * [kf5auth] update versions * [kf5guiaddons] fix missing static deps in cmake.in * [kf5guiaddons] update versions * [kf5coreaddons] fix inotify lookup * [kf5coreaddons] update versions * [kf5globalaccel] update info on required XCB extensions * [kf5globalaccel] update versions * [kf5kio] update versions Co-authored-by: Cheney Wang (Beyondsoft Corporation) <v-xincwa@microsoft.com>
2022-12-01 03:03:25 +08:00
endif()
[kf5guiaddons] fix Wayland scanner not being found by transitive deps; fix static builds (#19203) * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE variable to Config.cmake * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous options * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous lines, bump version * [kf5guiaddons] update versions * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE to MAYBE_UNUSED_VARIABLES * [kf5guiaddons] update versions * [kf5guiaddons] replace CURRENT_INSTALLED_DIR without affecting other vars * [kf5guiaddons] update deprecated functions * [kf5guiaddons] wrap paths in quotes * [kf5guiaddons] update versions * [kf5guiaddons] use PACKAGE_PREFIX relative path instead CURRENT_PACKAGES_DIR * [kf5guiaddons] update versions * [kf5guiaddons] cache the QtWaylandScanner_EXECUTABLE variable * [kf5guiaddons] update versions * [kf5guiaddons] update versions * [kf5guiaddons] Add missing static dependency * [kf5guiaddons] update versions * [kf5guiaddons] rename patch file * [kf5guiaddons] update versions * [kf5guiaddons] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5guiaddons] update versions
2021-08-31 01:04:04 +08:00
endif()
if (@WITH_WAYLAND@)
+ set(QtWaylandScanner_EXECUTABLE "${PACKAGE_PREFIX}/tools/qt5-wayland/bin/qtwaylandscanner" CACHE STRING "QtWaylandScanner workaround")
find_dependency(Wayland REQUIRED Client)
[kf5] Update to 5.98 (#26831) * [kf5] upgrade to 5.98 * [kf5] update versions * [plasma-wayland-protocols] new port * [plasma-wayland-protocols] update versions * [kf5guiaddons] add wayland dependency; make x11 a feature * [kf5guiaddons] update versions * [kf5auth] kauth has no support for Windows * [kf5auth] update versions * [kf5configwidgets] kauth has no support for Windows nor Android * [kf5configwidgets] update version * [kf5auth] add static dependencies * [kf5auth] update versions * [kf5globalaccel] globalaccel has no support for Windows * [kf5declarative] globalaccel has no support for Windows * [kf5] update versions * [kf5guiaddons] copy the kde-geo-uri-handler tool * [kf5guiaddons] update versions * [kf5kcmutils] fix QML files installation location * [kf5kcmutils] update versions * [kf5newstuff] fix unused variable warning * [kf5newstuff] update versions * [kf5coreaddons] fix static builds * [kf5coreaddons] update versions * [kf5kcmutils] copy kcmdesktopfilegenerator tool * [kf5kcmutils] update versions * [kf5kio] update libiconv patch * [kf5kio] update versions * [kf5globalaccel] add XCB dependncy on Linux * [kf5globalaccel] update versions * [kf5configwidgets] add coreaddons as new dependency * [kf5configwidgets] update version * [kf5kcmutils] update static compilation patch * [kf5kcmutils] update versions * [kf5auth] fix static dependencies * [kf5auth] update versions * [kf5auth] update cmake.in static deps patch * [kf5auth] update versions * [kf5guiaddons] fix missing static deps in cmake.in * [kf5guiaddons] update versions * [kf5coreaddons] fix inotify lookup * [kf5coreaddons] update versions * [kf5globalaccel] update info on required XCB extensions * [kf5globalaccel] update versions * [kf5kio] update versions Co-authored-by: Cheney Wang (Beyondsoft Corporation) <v-xincwa@microsoft.com>
2022-12-01 03:03:25 +08:00
find_dependency(Qt@QT_MAJOR_VERSION@WaylandClient @REQUIRED_QT_VERSION@)
[kf5guiaddons] fix Wayland scanner not being found by transitive deps; fix static builds (#19203) * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE variable to Config.cmake * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous options * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous lines, bump version * [kf5guiaddons] update versions * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE to MAYBE_UNUSED_VARIABLES * [kf5guiaddons] update versions * [kf5guiaddons] replace CURRENT_INSTALLED_DIR without affecting other vars * [kf5guiaddons] update deprecated functions * [kf5guiaddons] wrap paths in quotes * [kf5guiaddons] update versions * [kf5guiaddons] use PACKAGE_PREFIX relative path instead CURRENT_PACKAGES_DIR * [kf5guiaddons] update versions * [kf5guiaddons] cache the QtWaylandScanner_EXECUTABLE variable * [kf5guiaddons] update versions * [kf5guiaddons] update versions * [kf5guiaddons] Add missing static dependency * [kf5guiaddons] update versions * [kf5guiaddons] rename patch file * [kf5guiaddons] update versions * [kf5guiaddons] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5guiaddons] update versions
2021-08-31 01:04:04 +08:00
find_dependency(QtWaylandScanner)
Reference in New Issue Copy Permalink