diff options
| author | Marcus Müller <marcus@hostalia.de> | 2016-09-14 16:48:16 -0600 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2016-09-14 16:48:16 -0600 |
| commit | 222fd4391a39873b5e114f3d30d47608a658b090 (patch) | |
| tree | 951b1f5bb1f683769fefe8d4656a26c331d73bd8 /cmake | |
| parent | af4323d1e471476efa255e3df745397f7c8a1b71 (diff) | |
fixed the FindQwt to prefer pkgconfig for qt5-qwt
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index 0f24788c6d..bb448e6787 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -7,9 +7,11 @@ 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 @@ -42,9 +44,15 @@ find_library (QWT_LIBRARIES /usr/local/lib/qwt.framework ) +endif() set(QWT_FOUND FALSE) if(QWT_INCLUDE_DIRS) - file(STRINGS "${QWT_INCLUDE_DIRS}/qwt_global.h" + find_path(QWT_GLOBAL_DIR + NAMES qwt_global.h + HINTS + ${QWT_INCLUDE_DIRS} + ) + file(STRINGS "${QWT_GLOBAL_DIR}/qwt_global.h" QWT_STRING_VERSION REGEX "QWT_VERSION_STR") set(QWT_WRONG_VERSION True) set(QWT_VERSION "No Version") |