forked from pool/gnuradio
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From 25dedc0a2a7f0790f280770a7d22e9650ae2adbf Mon Sep 17 00:00:00 2001
|
|
From: Paul Cercueil <paul.cercueil@analog.com>
|
|
Date: Tue, 29 Sep 2015 13:30:59 +0200
|
|
Subject: [PATCH 02/22] CMake: FindQwt: Find the Qt5 version of QWT instead of
|
|
the Qt4 version
|
|
|
|
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
|
|
---
|
|
cmake/Modules/FindQwt.cmake | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
|
|
index da8bbe9049..2cffbe66f4 100644
|
|
--- a/cmake/Modules/FindQwt.cmake
|
|
+++ b/cmake/Modules/FindQwt.cmake
|
|
@@ -11,10 +11,10 @@ find_path(QWT_INCLUDE_DIRS
|
|
${CMAKE_INSTALL_PREFIX}/include/qwt
|
|
${CMAKE_PREFIX_PATH}/include/qwt
|
|
PATHS
|
|
- /usr/local/include/qwt-qt4
|
|
+ /usr/local/include/qwt-qt5
|
|
/usr/local/include/qwt
|
|
/usr/include/qwt6
|
|
- /usr/include/qwt-qt4
|
|
+ /usr/include/qwt-qt5
|
|
/usr/include/qwt
|
|
/usr/include/qwt5
|
|
/opt/local/include/qwt
|
|
@@ -23,7 +23,7 @@ find_path(QWT_INCLUDE_DIRS
|
|
)
|
|
|
|
find_library (QWT_LIBRARIES
|
|
- NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5
|
|
+ NAMES qwt6 qwt6-qt5 qwt qwt-qt5
|
|
HINTS
|
|
${CMAKE_INSTALL_PREFIX}/lib
|
|
${CMAKE_INSTALL_PREFIX}/lib64
|
|
--
|
|
2.11.0
|
|
|