diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 09:44:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 09:44:46 -0700 |
| commit | d2eab3b7bf96e2b910f30e80feaf93d78013063b (patch) | |
| tree | 015212f50cb03fd8dc94f1cdb2efd15e46d1140a | |
| parent | 113c4ef92819e703d24eb6a409751f2757635528 (diff) | |
| parent | f936720f4a238c5571f16cd2ce1388eab6a6e5ac (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_logger.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 60fd11dd31..3b50bcf6a1 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -58,6 +58,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier + ${CMAKE_BINARY_DIR} ) list(APPEND GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_BINARY_DIR}) @@ -67,6 +68,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_SOURCE_DIR}/gruel/src/swig ${CMAKE_BINARY_DIR}/gruel/src/swig + ${CMAKE_BINARY_DIR} ) ######################################################################## diff --git a/gnuradio-core/src/lib/runtime/gr_logger.h b/gnuradio-core/src/lib/runtime/gr_logger.h index 13f31d60b8..2ccd498822 100644 --- a/gnuradio-core/src/lib/runtime/gr_logger.h +++ b/gnuradio-core/src/lib/runtime/gr_logger.h @@ -530,7 +530,7 @@ typedef void* gr_logger_ptr; #define GR_GET_LEVEL(name, level) #define GR_LOG_GET_LEVEL(logger, level) #define GR_ADD_CONSOLE_APPENDER(logger,target,pattern) -#define GR_LOG_ADD_CONSOLE_APPENDER(logger,,target,pattern) +#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern) #define GR_ADD_FILE_APPENDER(name,filename,append,pattern) #define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern) #define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern) |