diff options
| author | Josh Blum | 2012-10-28 11:40:59 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-10-28 11:40:59 -0700 |
| commit | cbcedb10e8f59ac696478460c21150b811e8d083 (patch) | |
| tree | 81fdae1d565fad7c8232a39538dee7630aa131d4 /lib/CMakeLists.txt | |
| parent | 25ec793e687821bd2ac5862fcf934c4c9c0f47b6 (diff) | |
| parent | ebd812fd4702cbe5c9ef487f6efc8a4e0eb165e9 (diff) | |
| download | sandhi-cbcedb10e8f59ac696478460c21150b811e8d083.tar.gz sandhi-cbcedb10e8f59ac696478460c21150b811e8d083.tar.bz2 sandhi-cbcedb10e8f59ac696478460c21150b811e8d083.zip | |
Merge branch 'rc0_work'
Conflicts:
Apology
Diffstat (limited to 'lib/CMakeLists.txt')
| -rw-r--r-- | lib/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6081bb6..131c00a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -11,10 +11,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") add_definitions(-DGRAS_DEBUG) endif() -list(APPEND gnuradio_core_sources - ${CMAKE_CURRENT_SOURCE_DIR}/register_messages.cpp #exports messages, must be first -) - ######################################################################## # Setup Theron Deps ######################################################################## @@ -58,6 +54,7 @@ list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/register_messages.cpp ) #sources that are in tree that have not changed |