diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-08-08 16:44:15 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-08-08 16:44:15 -0400 |
| commit | 4ac28002fbea740f78c2339446cca2d1f118628f (patch) | |
| tree | c81ebb1aa487fdb3cc277415e68c360ef6c80b26 /gr-uhd | |
| parent | 41d0844328800cfc84c97e3961c39b5fafab11bb (diff) | |
| parent | 3d5df0ddd3aa8d5a94285b95f487747f25d4ee06 (diff) | |
Merge branch 'maint'
Conflicts:
gnuradio-runtime/CMakeLists.txt
gnuradio-runtime/lib/controlport/CMakeLists.txt
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-uhd/swig/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index 9121dd41b8..e0a9db8cc2 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -37,7 +37,6 @@ link_directories( if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) - include_directories(${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) include_directories(${LOG4CPP_INCLUDE_DIRS}) diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt index 4084bc07e9..ef54761d0f 100644 --- a/gr-uhd/swig/CMakeLists.txt +++ b/gr-uhd/swig/CMakeLists.txt @@ -34,7 +34,6 @@ set(GR_SWIG_INCLUDE_DIRS if(ENABLE_GR_CTRLPORT) list(APPEND GR_SWIG_FLAGS "-DGR_CTRLPORT") - list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/uhd_swig_doc.i) |