diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-20 06:23:17 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-09-20 06:23:17 -0700 |
| commit | e4093bd558e043af98e140f0e1d4f073e8606421 (patch) | |
| tree | 677f11cedeb9d905f9d2724c6dac1bd82d6d096a | |
| parent | 22924134e76d624ab59f1439a2998bc2e5882567 (diff) | |
| parent | a6c90ddeab6e5967f2f0e6cbb4e3f444cc38cd40 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-qtgui/examples/c++/CMakeLists.txt
| -rw-r--r-- | gr-qtgui/examples/c++/CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
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} ) |