From 28ea300d58fd0a08ad79c4458014255b9f6c0786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 24 Apr 2015 13:39:16 +0200 Subject: [PATCH] extra-cmake-modules: align path in FindQtWaylandScanner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../extra-cmake-modules.bb | 1 + ...canner.cmake-align-path-to-our-needs.patch | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 recipes-kde/kf5/untier/extra-cmake-modules/files/0001-FindQtWaylandScanner.cmake-align-path-to-our-needs.patch diff --git a/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb b/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb index 99832d3d..93ddaa67 100644 --- a/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb +++ b/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb @@ -8,6 +8,7 @@ DEPENDS = "qttools" SRC_URI[md5sum] = "98633e740805a56be02a23ffa1c57a73" SRC_URI[sha256sum] = "c991f2f16b2aa5941e52e56a1a2ee75c7fa3a5b7fc0a764b53fc12f789640bc7" +SRC_URI += "file://0001-FindQtWaylandScanner.cmake-align-path-to-our-needs.patch" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/untier/extra-cmake-modules/files/0001-FindQtWaylandScanner.cmake-align-path-to-our-needs.patch b/recipes-kde/kf5/untier/extra-cmake-modules/files/0001-FindQtWaylandScanner.cmake-align-path-to-our-needs.patch new file mode 100644 index 00000000..971e69f5 --- /dev/null +++ b/recipes-kde/kf5/untier/extra-cmake-modules/files/0001-FindQtWaylandScanner.cmake-align-path-to-our-needs.patch @@ -0,0 +1,31 @@ +From 320b6fdbd2c6b409c39ee0f0a320ab581a52bcf7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 24 Apr 2015 12:20:47 +0200 +Subject: [PATCH] FindQtWaylandScanner.cmake: align path to our needs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + find-modules/FindQtWaylandScanner.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake +index 79a1b05..cb9dbda 100644 +--- a/find-modules/FindQtWaylandScanner.cmake ++++ b/find-modules/FindQtWaylandScanner.cmake +@@ -90,7 +90,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) + ecm_find_package_version_check(QtWaylandScanner) + + # Find qtwaylandscanner +-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) ++find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/bin/qt5/) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(QtWaylandScanner +-- +1.9.3 +