diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
| commit | 99d24d23e95ea0235a8ea2957c289461625765a3 (patch) | |
| tree | 76f2b684acd54450f2af82215e6a2c0841a82321 /gnuradio-runtime/lib | |
| parent | e1e912858be7cb6d199fd5ca30c559e6afc48233 (diff) | |
| parent | 0d5fd62c70f5f633b124732a17ed90b061f94941 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-wxgui/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/lib')
| -rw-r--r-- | gnuradio-runtime/lib/CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index c6e42876ce..5e414164f8 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -44,11 +44,6 @@ configure_file( list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc) ######################################################################## -# Include subdirs rather to populate to the sources lists. -######################################################################## -#GR_INCLUDE_SUBDIRECTORY(foo) - -######################################################################## # Setup the include and linker paths ######################################################################## include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS} |