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-comedi | |
| parent | 41d0844328800cfc84c97e3961c39b5fafab11bb (diff) | |
| parent | 3d5df0ddd3aa8d5a94285b95f487747f25d4ee06 (diff) | |
Merge branch 'maint'
Conflicts:
gnuradio-runtime/CMakeLists.txt
gnuradio-runtime/lib/controlport/CMakeLists.txt
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-comedi/swig/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt index c8867782d8..98d4270087 100644 --- a/gr-comedi/lib/CMakeLists.txt +++ b/gr-comedi/lib/CMakeLists.txt @@ -36,7 +36,6 @@ link_directories( if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) - include_directories(${ICE_INCLUDE_DIR}) endif(ENABLE_GR_CTRLPORT) ######################################################################## diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt index 0c275cc48e..b31e4e87eb 100644 --- a/gr-comedi/swig/CMakeLists.txt +++ b/gr-comedi/swig/CMakeLists.txt @@ -31,7 +31,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) # Setup swig docs to depend on includes and pull in from build directory |