diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-04 19:06:33 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-04 19:06:33 -0500 |
| commit | eb65d13213ea163b4e0a60dc7ecaa5921981a412 (patch) | |
| tree | 8ef059ef82380fe1c8e45fea7ae5f00ead18f2c2 /cmake | |
| parent | 652a876ff6e236e459d1040877221425746869fc (diff) | |
| parent | d502e39c90c16b461be133366068d699f034e31c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 09270de67d..c7fe77bc88 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -232,18 +232,18 @@ function(GR_LOGGING) add_definitions( -DHAVE_LOG4CXX ) else(LOG4CXX_FOUND) SET(HAVE_LOG4CXX False CACHE INTERNAL "" FORCE) - SET(LOG4CXX_INCLUDE_DIRS "") - SET(LOG4CXX_LIBRARY_DIRS "") - SET(LOG4CXX_LIBRARIES "") + SET(LOG4CXX_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CXX_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CXX_LIBRARIES "" CACHE INTERNAL "" FORCE) endif(LOG4CXX_FOUND) SET(ENABLE_GR_LOG ${ENABLE_GR_LOG} CACHE INTERNAL "" FORCE) else(ENABLE_GR_LOG) SET(HAVE_LOG4CXX False CACHE INTERNAL "" FORCE) - SET(LOG4CXX_INCLUDE_DIRS) - SET(LOG4CXX_LIBRARY_DIRS) - SET(LOG4CXX_LIBRARIES) + SET(LOG4CXX_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CXX_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CXX_LIBRARIES "" CACHE INTERNAL "" FORCE) endif(ENABLE_GR_LOG) message(STATUS "ENABLE_GR_LOG set to ${ENABLE_GR_LOG}.") |