diff options
| author | Josh Blum | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /gr-qtgui/lib/CMakeLists.txt | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
| download | gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.gz gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.bz2 gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gr-qtgui/lib/CMakeLists.txt')
| -rw-r--r-- | gr-qtgui/lib/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index 6cd9e200a..3290b1e77 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -63,8 +63,7 @@ set(qtgui_srcs ######################################################################## include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} + ${GR_QTGUI_INCLUDE_DIRS} ) include_directories(${Boost_INCLUDE_DIRS}) @@ -111,10 +110,6 @@ install(FILES spectrumdisplayform.h SpectrumGUIClass.h spectrumUpdateEvents.h - qtgui_sink_c.h - qtgui_sink_f.h - qtgui_util.h - gr_qtgui_api.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "qtgui_devel" ) |