Blame 0001-FindQt5.cmake-look-in-the-correct-pkg-config-file-fo.patch
|
Rex Dieter |
c0bdaa6 |
From 8de45eb7c30677eb34b8054a5b06e4f1899f3937 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
c0bdaa6 |
From: George Kiagiadakis <gkiagia@tolabaki.gr>
|
|
Rex Dieter |
c0bdaa6 |
Date: Tue, 21 Jun 2016 15:17:10 +0300
|
|
Rex Dieter |
c0bdaa6 |
Subject: [PATCH 1/4] FindQt5.cmake: look in the correct pkg-config file for
|
|
Rex Dieter |
c0bdaa6 |
QT_CONFIG_FLAGS
|
|
Rex Dieter |
c0bdaa6 |
|
|
Rex Dieter |
c0bdaa6 |
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
|
|
Rex Dieter |
c0bdaa6 |
---
|
|
Rex Dieter |
c0bdaa6 |
cmake/modules/FindQt5.cmake | 2 +-
|
|
Rex Dieter |
c0bdaa6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Rex Dieter |
c0bdaa6 |
|
|
Rex Dieter |
c0bdaa6 |
diff --git a/cmake/modules/FindQt5.cmake b/cmake/modules/FindQt5.cmake
|
|
Rex Dieter |
c0bdaa6 |
index 957f7b3..c4db9c5 100644
|
|
Rex Dieter |
c0bdaa6 |
--- a/cmake/modules/FindQt5.cmake
|
|
Rex Dieter |
c0bdaa6 |
+++ b/cmake/modules/FindQt5.cmake
|
|
Rex Dieter |
c0bdaa6 |
@@ -122,7 +122,7 @@ MARK_AS_ADVANCED(QT_INCLUDES QT_INCLUDE_DIR
|
|
Rex Dieter |
c0bdaa6 |
QT_QMAKE_EXECUTABLE_FINDQT QT_QMAKE_EXECUTABLE QT_MOC_EXECUTABLE)
|
|
Rex Dieter |
c0bdaa6 |
|
|
Rex Dieter |
c0bdaa6 |
# Invokes pkgconfig, cleans up the result and sets variables
|
|
Rex Dieter |
c0bdaa6 |
-EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable qt_config QtCore
|
|
Rex Dieter |
c0bdaa6 |
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable qt_config Qt5Core
|
|
Rex Dieter |
c0bdaa6 |
OUTPUT_VARIABLE _pkgconfig_flags
|
|
Rex Dieter |
c0bdaa6 |
RESULT_VARIABLE _pkgconfig_failed)
|
|
Rex Dieter |
c0bdaa6 |
STRING(REPLACE " " ";" QT_CONFIG_FLAGS "${_pkgconfig_flags}")
|
|
Rex Dieter |
c0bdaa6 |
--
|
|
Rex Dieter |
c0bdaa6 |
1.9.3
|
|
Rex Dieter |
c0bdaa6 |
|