diff options
| author | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-04 21:32:13 -0500 |
|---|---|---|
| committer | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-04 21:32:13 -0500 |
| commit | c03114f9861920b246c36bb7e6b2098dadacd60e (patch) | |
| tree | 3e15aff8e513d7b745f971fd5de0023d6135d83c /gr-atsc | |
| parent | 68e99469dddd3b0347f59d0e3f50c60379390351 (diff) | |
| parent | baaf2b6cf06f464a710c3f36db4c9275dd915d92 (diff) | |
Merge master/fix_build_dir_order into next, then fix conflicts and redo come of the INCLUDE_DIRS order
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/src/lib/CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt index 68bc60689d..99525db80b 100644 --- a/gr-atsc/src/lib/CMakeLists.txt +++ b/gr-atsc/src/lib/CMakeLists.txt @@ -21,15 +21,15 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} + ${GR_ATSC_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} ${GR_FEC_INCLUDE_DIRS} - ${GR_ATSC_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) ######################################################################## @@ -212,7 +212,12 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_ATSC_INCLUDE_DIRS} + ${GR_FILTER_INCLUDE_DIRS} + ${GR_ANALOG_INCLUDE_DIRS} + ${GR_FEC_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) # add Doxygen docs to python |