[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: fixed the FindQwt to prefer pkgconfi
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: fixed the FindQwt to prefer pkgconfig for qt5-qwt |
Date: |
Thu, 15 Sep 2016 21:58:35 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 222fd4391a39873b5e114f3d30d47608a658b090
Author: Marcus Müller <address@hidden>
Date: Wed Sep 14 16:48:16 2016 -0600
fixed the FindQwt to prefer pkgconfig for qt5-qwt
---
cmake/Modules/FindQwt.cmake | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
index 0f24788..bb448e6 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -7,9 +7,11 @@
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
@@ -42,9 +44,15 @@ find_library (QWT_LIBRARIES
/usr/local/lib/qwt.framework
)
+endif()
set(QWT_FOUND FALSE)
if(QWT_INCLUDE_DIRS)
- file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h"
+ find_path(QWT_GLOBAL_DIR
+ NAMES qwt_global.h
+ HINTS
+ ${QWT_INCLUDE_DIRS}
+ )
+ file(STRINGS "${QWT_GLOBAL_DIR}/qwt_global.h"
QWT_STRING_VERSION REGEX "QWT_VERSION_STR")
set(QWT_WRONG_VERSION True)
set(QWT_VERSION "No Version")