diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e3fbe4b4c5159ff9d081b8a4e41e46f477cebb2..f4d05b481afef6ed2cbd82f3ca718b2507d7eec3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,16 +200,8 @@ if(ENABLE_DOCS) find_package(Doxygen) endif() -# if(ENABLE_LOG) - if(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARY) - set(LOG4CXX_LIBRARIES ${LOG4CXX_LIBRARY}) - set(LOG4CXX_FOUND 1) - message(STATUS "Using log4cxx: ${CPPUNIT_INCLUDE_DIR} ${LOG4CXX_INCLUDE_DIR}") - else() - set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") - find_package(log4cxx) - endif() -# endif() +set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") +find_package(log4cxx) # FIND CPPUNIT if(ENABLE_TESTS) diff --git a/cmake_modules/Findlog4cxx.cmake b/cmake_modules/Findlog4cxx.cmake index 4b6772434f49cd098fd7bf4b30e010c9a3b2acb6..0b68a76f936d2df443adc919a8b73b8603ff7eef 100644 --- a/cmake_modules/Findlog4cxx.cmake +++ b/cmake_modules/Findlog4cxx.cmake @@ -3,7 +3,7 @@ # LOG4CXX_LIBRARIES - liblog4cxx library FIND_PATH(LOG4CXX_INCLUDE_DIR log4cxx/logger.h PATHS /include /usr/include /usr/local/include ) -FIND_LIBRARY(LOG4CXX_LIBRARIES NAMES log4cxx log4cxxd PATHS /lib /usr/lib /usr/local/lib ${LOG4CXX_LIBRARIES}) +FIND_LIBRARY(LOG4CXX_LIBRARIES NAMES log4cxx log4cxxd PATHS /lib /usr/lib /usr/local/lib ) IF(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES) SET(LOG4CXX_FOUND 1)