diff options
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 12 | ||||
| -rw-r--r-- | gr-qtgui/examples/c++/CMakeLists.txt | 17 |
2 files changed, 10 insertions, 19 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") diff --git a/gr-qtgui/examples/c++/CMakeLists.txt b/gr-qtgui/examples/c++/CMakeLists.txt index fb0b19a6d9..88275196d0 100644 --- a/gr-qtgui/examples/c++/CMakeLists.txt +++ b/gr-qtgui/examples/c++/CMakeLists.txt @@ -18,14 +18,14 @@ # Boston, MA 02110-1301, USA. include_directories( - ${GR_QTGUI_INCLUDE_DIRS} - ${GR_ANALOG_INCLUDE_DIRS} - ${GR_FILTER_INCLUDE_DIRS} - ${GR_BLOCKS_INCLUDE_DIRS} - ${GR_FFT_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${QT_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} + ${GR_QTGUI_INCLUDE_DIRS} + ${GR_ANALOG_INCLUDE_DIRS} + ${GR_FILTER_INCLUDE_DIRS} + ${GR_BLOCKS_INCLUDE_DIRS} + ${GR_FFT_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) list(APPEND QTGUI_LIBRARIES @@ -35,7 +35,6 @@ list(APPEND QTGUI_LIBRARIES gnuradio-blocks gnuradio-fft gnuradio-runtime - ${QWT_LIBRARY_DIRS} ${QT_LIBRARIES} ) |