From 9238df73bd4922df2b79d6b7bc3e94b90f4c8f12 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Tue, 22 Jan 2013 21:20:48 +0100 Subject: [PATCH] Make log4cxx required on linux --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5e63bc5..60544139 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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()