Commit b6afcc0a086e97aaec67f89bc51b3429eda02b04

Simplify use of Log4cxx.
  
5050#find_optional_dep(Exiv2 ENABLE_EXIV2 EXIV2_FOUND "indexing of EXIF/IPTC metadata")
5151include(ConfigureChecks.cmake)
5252configure_file(LibSearchClient.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibSearchClientConfig.cmake @ONLY )
53IF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
54 add_definitions(-DHAVE_LOG4CXX)
55ENDIF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
56
5357
5458##### building and testing #####
5559
  
11subdirs(dbuscpp)
22
3IF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
4 add_definitions(-DHAVE_LOG4CXX)
5 set(test_LIBS ${LOG4CXX_LIBRARIES})
6ENDIF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
7
83# if available, use Perl for generating the dbus interfaces.
94# otherwise, just copy them into the build directory
105find_package(Perl)
6969target_link_libraries(dbusserver dbuscpp)
7070
7171add_executable(testserver testserver.cpp ../strigithread.cpp)
72target_link_libraries(testserver dbusserver ${CMAKE_THREAD_LIBS_INIT} ${DBUS_LIBRARIES} ${test_LIBS} streamanalyzer)
72target_link_libraries(testserver dbusserver ${CMAKE_THREAD_LIBS_INIT} ${DBUS_LIBRARIES} ${LOG4CXX_LIBRARIES} streamanalyzer)
7373
7474add_executable(dbustest dbustest.cpp)
75target_link_libraries(dbustest ${CMAKE_THREAD_LIBS_INIT} ${test_LIBS} ${DBUS_LIBRARIES})
75target_link_libraries(dbustest ${CMAKE_THREAD_LIBS_INIT} ${LOG4CXX_LIBRARIES} ${DBUS_LIBRARIES})
7676
7777configure_file(vandenoever.strigi.service.cmake
7878 ${CMAKE_CURRENT_BINARY_DIR}/vandenoever.strigi.service)
  
1set(strigicmd_LIBS streamanalyzer combinedindex)
2
3IF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
4 add_definitions(-DHAVE_LOG4CXX)
5 set(strigicmd_LIBS ${strigicmd_LIBS} ${LOG4CXX_LIBRARIES})
6ENDIF (ENABLE_LOG4CXX AND LOG4CXX_FOUND)
7
81add_executable(strigicmd strigicmd.cpp)
92
10target_link_libraries(strigicmd ${strigicmd_LIBS})
3target_link_libraries(strigicmd ${LOG4CXX_LIBRARIES} streamanalyzer combinedindex)
114
125install(TARGETS strigicmd RUNTIME DESTINATION bin)
  
1818 endif(NOT Log4cxx_FIND_QUIETLY)
1919ELSE(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)
2020 SET(LOG4CXX_FOUND 0 CACHE BOOL "Not found log4cxx library")
21 set(LOG4CXX_INCLUDE_DIR "")
22 set(LOG4CXX_LIBRARIES "")
2123 message(STATUS "NOT Found log4cxx, disabling it")
2224ENDIF(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)
2325