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 /gr-trellis/lib | |
| parent | e1e912858be7cb6d199fd5ca30c559e6afc48233 (diff) | |
| parent | 0d5fd62c70f5f633b124732a17ed90b061f94941 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-wxgui/lib/CMakeLists.txt
Diffstat (limited to 'gr-trellis/lib')
| -rw-r--r-- | gr-trellis/lib/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt index 3d268c608f..a016f9885a 100644 --- a/gr-trellis/lib/CMakeLists.txt +++ b/gr-trellis/lib/CMakeLists.txt @@ -25,12 +25,10 @@ include_directories( ${GR_TRELLIS_INCLUDE_DIRS} ${GR_DIGITAL_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories(${Boost_LIBRARY_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) |