Make log4cxx required on linux
This commit is contained in:
parent
e00778ef4b
commit
9238df73bd
1 changed files with 6 additions and 6 deletions
|
@ -29,7 +29,7 @@ option(ENABLE_TWITTER "Build Twitter plugin" ON)
|
|||
option(ENABLE_YAHOO2 "Build Libyahoo2 plugin" ON)
|
||||
|
||||
option(ENABLE_DOCS "Build Docs" ON)
|
||||
option(ENABLE_LOG "Build with logging using Log4cxx" ON)
|
||||
# option(ENABLE_LOG "Build with logging using Log4cxx" ON)
|
||||
option(ENABLE_TESTS "Build Tests using CppUnit" OFF)
|
||||
|
||||
MACRO(LIST_CONTAINS var value)
|
||||
|
@ -225,7 +225,7 @@ if(ENABLE_DOCS)
|
|||
find_package(Doxygen)
|
||||
endif()
|
||||
|
||||
if(ENABLE_LOG)
|
||||
# if(ENABLE_LOG)
|
||||
if(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARY)
|
||||
set(LOG4CXX_LIBRARIES ${LOG4CXX_LIBRARY})
|
||||
set(LOG4CXX_FOUND 1)
|
||||
|
@ -234,7 +234,7 @@ if(ENABLE_LOG)
|
|||
set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
|
||||
find_package(log4cxx)
|
||||
endif()
|
||||
endif()
|
||||
# endif()
|
||||
|
||||
# FIND CPPUNIT
|
||||
if(ENABLE_TESTS)
|
||||
|
@ -423,10 +423,10 @@ if (LOG4CXX_FOUND)
|
|||
ADD_DEFINITIONS(-DWITH_LOG4CXX)
|
||||
else()
|
||||
set(LOG4CXX_LIBRARIES "")
|
||||
if(ENABLE_LOG)
|
||||
if (WIN32)
|
||||
message("Log4cxx : no (install log4cxx-devel)")
|
||||
else(ENABLE_LOG)
|
||||
message("Log4cxx : no (user disabled)")
|
||||
else()
|
||||
message(FATAL_ERROR "Log4cxx : no (install log4cxx-devel)")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue