libtransport.git Changeset - 149c0101f7e9

Changeset - 149c0101f7e9

Parent rev.

Child rev.

[Not reviewed]

0 2 1

Jan Kaluza - 14 years ago 2011-06-20 14:19:04
hanzz.k@gmail.com

Added log4cxx dependency

3 files changed with 32 insertions and 1 deletions:

CMakeLists.txt

cmake_modules/log4cxxConfig.cmake

src/CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -30,6 +30,9 @@ find_package(Protobuf REQUIRED) @@
 set(IRCClientQt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(IRCClientQt)
 set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(log4cxx)
 find_package(Doxygen)
 INCLUDE(FindQt4)
@@ @@ -76,6 +79,13 @@ else() @@
 	message("IRC plugin        : no (install libircclient-qt and Google Protocol Buffers)")
 endif()
 if (LOG4CXX_FOUND)
 	message("Logging           : yes")
 	include_directories(${LOG4CXX_INCLUDE_DIR})
 else()
 	message(FATAL_ERROR "Logging           : no (install log4cxx-devel)")
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	ADD_DEFINITIONS(-O0)
 	ADD_DEFINITIONS(-ggdb)

cmake_modules/log4cxxConfig.cmake

➞

Show inline comments

@@ new file 100644 @@
 # LOG4CXX_FOUND - system has liblog4cxx
 # LOG4CXX_INCLUDE_DIR - the liblog4cxx include directory
 # LOG4CXX_LIBRARIES - liblog4cxx library
 FIND_PATH(LOG4CXX_INCLUDE_DIR logger.h PATHS /include/log4cxx /usr/include/log4cxx /usr/local/include/log4cxx )
 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)
   #remove last /log4cxx string
   STRING(REGEX REPLACE "/log4cxx" " " LOG4CXX_INCLUDE_DIR_SUP_LEVEL ${LOG4CXX_INCLUDE_DIR})
   SET (LOG4CXX_INCLUDE_DIR ${LOG4CXX_INCLUDE_DIR_SUP_LEVEL} ${LOG4CXX_INCLUDE_DIR} )
   if(NOT Log4cxx_FIND_QUIETLY)
    message(STATUS "Found log4cxx: ${LOG4CXX_LIBRARIES}" ", " ${LOG4CXX_INCLUDE_DIR})
   endif(NOT Log4cxx_FIND_QUIETLY)
 ELSE(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)
   SET(LOG4CXX_FOUND 0 CACHE BOOL "Not found log4cxx library")
   message(STATUS "NOT Found log4cxx, disabling it")
 ENDIF(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)
 MARK_AS_ADVANCED(LOG4CXX_INCLUDE_DIR LOG4CXX_LIBRARIES)

src/CMakeLists.txt

➞

Show inline comments

@@ @@ -12,7 +12,7 @@ endif() @@
 ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS})
 ADD_DEFINITIONS(-fPIC)
 TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES})
+TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES})
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}

0 comments (0 inline, 0 general)