diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 10:09:06 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 10:09:06 -0700 |
| commit | 93192a843433d79e134719050d0a466aa47c4f4c (patch) | |
| tree | 43a243499e4e2fa7e1e144255e03e68bd5407365 | |
| parent | d2eab3b7bf96e2b910f30e80feaf93d78013063b (diff) | |
| parent | 030990813829949bba04b1940312ac3b1ce79f3d (diff) | |
Merge branch 'master' into next
Conflicts:
config.h.in
| -rw-r--r-- | config.h.in | 11 | ||||
| -rw-r--r-- | volk/apps/CMakeLists.txt | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/config.h.in b/config.h.in index 5e73835ea8..82751a3cf7 100644 --- a/config.h.in +++ b/config.h.in @@ -21,11 +21,20 @@ #ifndef GNURADIO_CONFIG_H #define GNURADIO_CONFIG_H - +#ifndef TRY_SHM_VMCIRCBUF #cmakedefine TRY_SHM_VMCIRCBUF +#endif +#ifndef GR_PERFORMANCE_COUNTERS #cmakedefine GR_PERFORMANCE_COUNTERS +#endif +#ifndef GR_CTRLPORT #cmakedefine GR_CTRLPORT +#endif +#ifndef ENABLE_GR_LOG #cmakedefine ENABLE_GR_LOG +#endif +#ifndef HAVE_LOG4CPP #cmakedefine HAVE_LOG4CPP +#endif #endif /* GNURADIO_CONFIG_H */ diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt index 577b7ef137..f847dd6245 100644 --- a/volk/apps/CMakeLists.txt +++ b/volk/apps/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2011-2012 Free Software Foundation, Inc. +# Copyright 2011-2013 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ if(Boost_FOUND) if(MSVC) - include_directories(${CMAKE_SOURCE_DIR}/msvc) + include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) endif(MSVC) include_directories( |