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-trellis | |
| 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-trellis')
| -rw-r--r-- | gr-trellis/lib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gr-trellis/swig/CMakeLists.txt | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt index 5bd0227de6..82d2a41426 100644 --- a/gr-trellis/lib/CMakeLists.txt +++ b/gr-trellis/lib/CMakeLists.txt @@ -21,17 +21,19 @@ # Setup the include and linker paths ######################################################################## include_directories( - ${GNURADIO_CORE_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR}/../include ${GR_TRELLIS_INCLUDE_DIRS} ${GR_DIGITAL_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR}/../include + ${GNURADIO_CORE_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) -include_directories(${Boost_INCLUDE_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) + include_directories(${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) ####################################################################### diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt index 36a5f850ad..c2bbf3bc69 100644 --- a/gr-trellis/swig/CMakeLists.txt +++ b/gr-trellis/swig/CMakeLists.txt @@ -27,12 +27,15 @@ set(GR_SWIG_INCLUDE_DIRS ${GR_TRELLIS_INCLUDE_DIRS} ${GR_DIGITAL_INCLUDE_DIRS} ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_LIBRARIES gnuradio-trellis gnuradio-digital) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) + list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) # Setup swig docs to depend on includes and pull in from build directory |