diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-04 09:22:25 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-04 09:22:25 -0500 |
| commit | 3c5d1c72471f71484d25002b85061fe7fa543116 (patch) | |
| tree | e3ba7367bd08731cbbf10bd400c63b8c5f76aaac /cmake | |
| parent | 34c7025bc12585b493b71297284f365054d29bd7 (diff) | |
| parent | 647e8263d9c03894d3986482af8cec6315c310c7 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 751aad5b4c..09270de67d 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -228,10 +228,10 @@ function(GR_LOGGING) # also test LOG4CXX; if we have it, use this version of the logger # otherwise, default to the stdout/stderr model. if(LOG4CXX_FOUND) - SET(HAVE_LOG4CXX True) + SET(HAVE_LOG4CXX True CACHE INTERNAL "" FORCE) add_definitions( -DHAVE_LOG4CXX ) else(LOG4CXX_FOUND) - SET(HAVE_LOG4CXX False) + SET(HAVE_LOG4CXX False CACHE INTERNAL "" FORCE) SET(LOG4CXX_INCLUDE_DIRS "") SET(LOG4CXX_LIBRARY_DIRS "") SET(LOG4CXX_LIBRARIES "") @@ -240,7 +240,7 @@ function(GR_LOGGING) SET(ENABLE_GR_LOG ${ENABLE_GR_LOG} CACHE INTERNAL "" FORCE) else(ENABLE_GR_LOG) - SET(HAVE_LOG4CXX False) + SET(HAVE_LOG4CXX False CACHE INTERNAL "" FORCE) SET(LOG4CXX_INCLUDE_DIRS) SET(LOG4CXX_LIBRARY_DIRS) SET(LOG4CXX_LIBRARIES) |