[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/08: CMake: FindQwt: Find the Qt5 version
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/08: CMake: FindQwt: Find the Qt5 version of QWT instead of the Qt4 version |
Date: |
Sat, 28 Nov 2015 21:28:40 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit 1a56aad42e7911d5be08485ff3bfac9c2c53c5f8
Author: Paul Cercueil <address@hidden>
Date: Tue Sep 29 13:30:59 2015 +0200
CMake: FindQwt: Find the Qt5 version of QWT instead of the Qt4 version
Signed-off-by: Paul Cercueil <address@hidden>
---
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 3ce49aa..95ddd44 100644
--- a/cmake/Modules/FindQwt.cmake
+++ b/cmake/Modules/FindQwt.cmake
@@ -10,10 +10,10 @@ find_path(QWT_INCLUDE_DIRS
HINTS
${CMAKE_INSTALL_PREFIX}/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
@@ -22,7 +22,7 @@ find_path(QWT_INCLUDE_DIRS
)
find_library (QWT_LIBRARIES
- NAMES qwt6 qwt6-qt4 qwt qwt-qt4
+ NAMES qwt6 qwt6-qt5 qwt qwt-qt5
HINTS
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
- [Commit-gnuradio] [gnuradio] branch next-qt5 created (now 480420d), git, 2015/11/28
- [Commit-gnuradio] [gnuradio] 01/08: CMake: Update required minimum version to 2.8.12, git, 2015/11/28
- [Commit-gnuradio] [gnuradio] 04/08: grc: Generate Python scripts that use PyQt5, git, 2015/11/28
- [Commit-gnuradio] [gnuradio] 06/08: gr-qtgui: Add a workaround for an upstream bug of 'uic', git, 2015/11/28
- [Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'tom/qt5_next' into next-qt5, git, 2015/11/28
- [Commit-gnuradio] [gnuradio] 02/08: CMake: FindQwt: Find the Qt5 version of QWT instead of the Qt4 version,
git <=
- [Commit-gnuradio] [gnuradio] 05/08: CMake: Remove obsolete GrSetupQt4 module, git, 2015/11/28
- [Commit-gnuradio] [gnuradio] 03/08: gr-qtgui: update for Qt5, git, 2015/11/28
- [Commit-gnuradio] [gnuradio] 07/08: qtgui: fixed examples for Qt5 compatibility., git, 2015/11/28