diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 17:43:16 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 17:43:16 -0400 |
| commit | 8b946999a7e332249236d7317a76fdd8d3387dc7 (patch) | |
| tree | efa53402a38401c9b9c5c2ce5506fb4d585589f8 /cmake | |
| parent | b8aa54c9ca45ac94faff975196047a6fc23f6245 (diff) | |
log: fixes to replace log4cxx with log4cpp.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindLog4cpp.cmake | 23 | ||||
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 2 |
2 files changed, 9 insertions, 16 deletions
diff --git a/cmake/Modules/FindLog4cpp.cmake b/cmake/Modules/FindLog4cpp.cmake index 0b7208630f..fc314c61a5 100644 --- a/cmake/Modules/FindLog4cpp.cmake +++ b/cmake/Modules/FindLog4cpp.cmake @@ -23,19 +23,17 @@ find_library(LOG4CPP_LIBRARY PATHS /usr/lib /usr/local/lib /opt/local/lib ) -message("#####################") -message("LOG INCLEUDE :${LOG4CPP_INCLUDE_DIR}") -message("LOG LIBRARY :${LOG4CPP_LIBRARY}") - - -message("#####################") if (LOG4CPP_INCLUDE_DIR AND LOG4CPP_LIBRARY) set(LOG4CPP_FOUND TRUE) - set(LOG4CPP_LIBRARIES ${LOG4CPP_LIBRARY} ) + set(LOG4CPP_LIBRARIES ${LOG4CPP_LIBRARY} CACHE INTERNAL "" FORCE) + set(LOG4CPP_INCLUDE_DIRS ${LOG4CPP_INCLUDE_DIR} CACHE INTERNAL "" FORCE) else () - set(LOG4CPP_FOUND FALSE) - set(LOG4CPP_LIBRARIES ) + set(LOG4CPP_FOUND FALSE CACHE INTERNAL "" FORCE) + set(LOG4CPP_LIBRARY "" CACHE INTERNAL "" FORCE) + set(LOG4CPP_LIBRARIES "" CACHE INTERNAL "" FORCE) + set(LOG4CPP_INCLUDE_DIR "" CACHE INTERNAL "" FORCE) + set(LOG4CPP_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE) endif () if (LOG4CPP_FOUND) @@ -49,10 +47,7 @@ else () endif () endif () -message("internal libs: ${LOG4CPP_LIBRARIES}") - mark_as_advanced( - LOG4CPP_LIBRARY LOG4CPP_LIBRARIES - LOG4CPP_INCLUDE_DIR - ) + LOG4CPP_INCLUDE_DIRS +) diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 65b0b5a8c8..69ff1f5ddc 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -220,8 +220,6 @@ endfunction(GR_GEN_TARGET_DEPS) function(GR_LOGGING) find_package(Log4cpp) - message(STATUS "LOG4CPP_LIBRARIES First set to ${LOG4CPP_LIBRARIES}.") - OPTION(ENABLE_GR_LOG "Use gr_logger" ON) if(ENABLE_GR_LOG) # If gr_logger is enabled, make it usable |