diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-05 21:15:49 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-05 21:15:49 -0700 |
| commit | ca86c6f82d81bbc57bfe898afb8489a419ddbe63 (patch) | |
| tree | 272a4623e6fd247c82d17d01e65ed14f3abe72a4 /gnuradio-core/CMakeLists.txt | |
| parent | 0ea25051b5126d9761e49ceeb0e5d76aaecd2ca3 (diff) | |
| parent | 492446d2ec6ed85d6437bb35caf4700b02930147 (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts:
gr-trellis/src/lib/trellis_permutation.h
Diffstat (limited to 'gnuradio-core/CMakeLists.txt')
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index b72bf70d68..780770bb8f 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -49,19 +49,19 @@ INCLUDE(GrMiscUtils) GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} #headers depend on gruel ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/general ${CMAKE_CURRENT_BINARY_DIR}/src/lib/general - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/gengen + ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/general ${CMAKE_CURRENT_BINARY_DIR}/src/lib/gengen - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/filter + ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/gengen ${CMAKE_CURRENT_BINARY_DIR}/src/lib/filter + ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/filter ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/missing ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/reed-solomon ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/viterbi ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/io ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/g72x - ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig + ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier ) |