diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-11-15 13:44:15 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-11-15 15:31:22 -0800 |
| commit | a49ec7765c27e3b114fbcac4dbc1c877863886c7 (patch) | |
| tree | 7e4acf147dc18f37b813a7ce83b8818fa137bbbd /cmake | |
| parent | 1d4abda4f78e640d86e63858c65c0b6db9c23b07 (diff) | |
cmake: qwt: Only allow qwt-qt5 as a library name
The only way to be sure that FindQwt.cmake is finding the Qt5 version
of Qwt is to either
- limit the name to qwt-qt5 or
- have the user specify it when running CMake.
The latter is unimpeded by this change. However, by default, it'll now
skip libqwt.so on Fedora and Ubuntu systems, which is actually only
a valid library when using Qt4, not Qt5.
Fixes #2027.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index b4917e0941..dd479b16d9 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -33,7 +33,7 @@ find_path(QWT_INCLUDE_DIRS ) find_library (QWT_LIBRARIES - NAMES qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION} qwt6 qwt qwt5 qwtd5 + NAMES qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION} HINTS ${PC_QWT_LIBDIR} ${CMAKE_INSTALL_PREFIX}/lib |