diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:08:07 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:08:07 -0700 |
| commit | c034036fbb0a097b2ccbbacdfdb113f8355cdbcc (patch) | |
| tree | 12366caf390de89db7e7e32646b08854c8f01bc5 /cmake/Modules/FindQwt.cmake | |
| parent | 11ce2621937e6fa1d5440c8f485c7a27b9d34d27 (diff) | |
| parent | c5f7b07aff9320e3d13bb8d26aa4dc43093e569a (diff) | |
Merge branch 'next' into 'next-qt5'
Diffstat (limited to 'cmake/Modules/FindQwt.cmake')
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 95ddd4454b..547a49f0ec 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -9,6 +9,7 @@ find_path(QWT_INCLUDE_DIRS NAMES qwt_global.h HINTS ${CMAKE_INSTALL_PREFIX}/include/qwt + ${CMAKE_PREFIX_PATH}/include/qwt PATHS /usr/local/include/qwt-qt5 /usr/local/include/qwt @@ -22,10 +23,11 @@ find_path(QWT_INCLUDE_DIRS ) find_library (QWT_LIBRARIES - NAMES qwt6 qwt6-qt5 qwt qwt-qt5 + NAMES qwt6 qwt6-qt4 qwt qwt-qt4 qwt5 qwtd5 HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 + ${CMAKE_PREFIX_PATH}/lib PATHS /usr/local/lib /usr/lib |