Package: gnuradio / 3.7.13.4-4

qt5-maint-0016-Revert-fixed-the-FindQwt-to-prefer-pkgconfig-for-qt5.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From 0eaf5c46e85d34ce4c527315141fc5c8a9381acd Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <johnathan@corganlabs.com>
Date: Tue, 20 Sep 2016 06:44:31 -0700
Subject: [PATCH 16/22] Revert "fixed the FindQwt to prefer pkgconfig for
 qt5-qwt"

This reverts commit 222fd4391a39873b5e114f3d30d47608a658b090.
---
 cmake/Modules/FindQwt.cmake | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
index 971578fd23..2b83fbf2a4 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -7,11 +7,9 @@
 
 if (${DESIRED_QT_VERSION} MATCHES 5)
   set(QWT_QT_VERSION qt5)
-  message(STATUS "Looking for Qt5Qwt6")
-  pkg_check_modules(QWT Qt5Qwt6)
-  message(STATUS "found ${QWT_FOUND}")
 else()
   set(QWT_QT_VERSION qt4)
+endif()
 
 find_path(QWT_INCLUDE_DIRS
   NAMES qwt_global.h
@@ -44,15 +42,9 @@ find_library (QWT_LIBRARIES
   /usr/local/lib/qwt.framework
 )
 
-endif()
 set(QWT_FOUND FALSE)
 if(QWT_INCLUDE_DIRS)
-  find_path(QWT_GLOBAL_DIR
-    NAMES qwt_global.h
-    HINTS
-    ${QWT_INCLUDE_DIRS}
-    )
-  file(STRINGS "${QWT_GLOBAL_DIR}/qwt_global.h"
+  file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h"
     QWT_STRING_VERSION REGEX "QWT_VERSION_STR")
   set(QWT_WRONG_VERSION True)
   set(QWT_VERSION "No Version")
-- 
2.11.0