diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-20 06:44:31 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-20 06:44:31 -0700 |
| commit | 7ffc467049a11952273c308128dcb956e6503df6 (patch) | |
| tree | b1ae540eb10cf8f637a61af2f373bd8946ab76a3 /cmake | |
| parent | e4093bd558e043af98e140f0e1d4f073e8606421 (diff) | |
Revert "fixed the FindQwt to prefer pkgconfig for qt5-qwt"
This reverts commit 222fd4391a39873b5e114f3d30d47608a658b090.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index bb448e6787..0f24788c6d 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -7,11 +7,9 @@ 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 @@ -44,15 +42,9 @@ find_library (QWT_LIBRARIES /usr/local/lib/qwt.framework ) -endif() set(QWT_FOUND FALSE) if(QWT_INCLUDE_DIRS) - find_path(QWT_GLOBAL_DIR - NAMES qwt_global.h - HINTS - ${QWT_INCLUDE_DIRS} - ) - file(STRINGS "${QWT_GLOBAL_DIR}/qwt_global.h" + file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h" QWT_STRING_VERSION REGEX "QWT_VERSION_STR") set(QWT_WRONG_VERSION True) set(QWT_VERSION "No Version") |