summaryrefslogtreecommitdiff
path: root/gr-fft/lib
diff options
context:
space:
mode:
authorMichael L Dickens <mlk@alum.mit.edu>2013-01-04 21:32:13 -0500
committerMichael L Dickens <mlk@alum.mit.edu>2013-01-04 21:32:13 -0500
commitc03114f9861920b246c36bb7e6b2098dadacd60e (patch)
tree3e15aff8e513d7b745f971fd5de0023d6135d83c /gr-fft/lib
parent68e99469dddd3b0347f59d0e3f50c60379390351 (diff)
parentbaaf2b6cf06f464a710c3f36db4c9275dd915d92 (diff)
Merge master/fix_build_dir_order into next, then fix conflicts and redo come of the INCLUDE_DIRS order
Diffstat (limited to 'gr-fft/lib')
-rw-r--r--gr-fft/lib/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt
index c16e0d1164..26fcaa7cde 100644
--- a/gr-fft/lib/CMakeLists.txt
+++ b/gr-fft/lib/CMakeLists.txt
@@ -23,8 +23,9 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${GNURADIO_CORE_INCLUDE_DIRS}
${GR_FFT_INCLUDE_DIRS}
+ ${GNURADIO_CORE_INCLUDE_DIRS}
+ ${GRUEL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${FFTW3F_INCLUDE_DIRS}
)