diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /cmake/Modules/GrMiscUtils.cmake | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'cmake/Modules/GrMiscUtils.cmake')
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index c7fe77bc88..69ff1f5ddc 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -218,36 +218,37 @@ endfunction(GR_GEN_TARGET_DEPS) # Can manually set with -DENABLE_GR_LOG=0|1 ######################################################################## function(GR_LOGGING) - find_package(Log4cxx) + find_package(Log4cpp) OPTION(ENABLE_GR_LOG "Use gr_logger" ON) if(ENABLE_GR_LOG) # If gr_logger is enabled, make it usable add_definitions( -DENABLE_GR_LOG ) - # also test LOG4CXX; if we have it, use this version of the logger + # also test LOG4CPP; if we have it, use this version of the logger # otherwise, default to the stdout/stderr model. - if(LOG4CXX_FOUND) - SET(HAVE_LOG4CXX True CACHE INTERNAL "" FORCE) - add_definitions( -DHAVE_LOG4CXX ) - else(LOG4CXX_FOUND) - SET(HAVE_LOG4CXX False CACHE INTERNAL "" FORCE) - SET(LOG4CXX_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE) - SET(LOG4CXX_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE) - SET(LOG4CXX_LIBRARIES "" CACHE INTERNAL "" FORCE) - endif(LOG4CXX_FOUND) + if(LOG4CPP_FOUND) + SET(HAVE_LOG4CPP True CACHE INTERNAL "" FORCE) + add_definitions( -DHAVE_LOG4CPP ) + else(not LOG4CPP_FOUND) + SET(HAVE_LOG4CPP False CACHE INTERNAL "" FORCE) + SET(LOG4CPP_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CPP_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CPP_LIBRARIES "" CACHE INTERNAL "" FORCE) + endif(LOG4CPP_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 "" CACHE INTERNAL "" FORCE) - SET(LOG4CXX_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE) - SET(LOG4CXX_LIBRARIES "" CACHE INTERNAL "" FORCE) + SET(HAVE_LOG4CPP False CACHE INTERNAL "" FORCE) + SET(LOG4CPP_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CPP_LIBRARY_DIRS "" CACHE INTERNAL "" FORCE) + SET(LOG4CPP_LIBRARIES "" CACHE INTERNAL "" FORCE) endif(ENABLE_GR_LOG) message(STATUS "ENABLE_GR_LOG set to ${ENABLE_GR_LOG}.") - message(STATUS "HAVE_LOG4CXX set to ${HAVE_LOG4CXX}.") + message(STATUS "HAVE_LOG4CPP set to ${HAVE_LOG4CPP}.") + message(STATUS "LOG4CPP_LIBRARIES set to ${LOG4CPP_LIBRARIES}.") endfunction(GR_LOGGING) |