libtransport.git Changeset - 78ee619f3f16

Changeset - 78ee619f3f16

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Florian Kinder - 7 years ago 2018-12-01 11:39:11
florian.kinder@fankserver.com

Fixed log4cxx build

2 files changed with 3 insertions and 11 deletions:

CMakeLists.txt

cmake_modules/Findlog4cxx.cmake

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -107,202 +107,194 @@ endif() @@
 # FIND SQLITE3
 if (ENABLE_SQLITE3)
 	find_package(sqlite3)
 endif()
 # FIND MYSQL
 if(ENABLE_MYSQL)
 	find_package(mysql)
 endif()
 # FIND PQXX
 if(ENABLE_PQXX)
 	find_package(pqxx)
 endif()
 ###### Plugins ######
 # FIND LIBPURPLE
 if(ENABLE_PURPLE)
 	find_package(purple)
 	if (WIN32)
 		if (PURPLE_NOT_RUNTIME)
 			add_definitions(-DPURPLE_RUNTIME=0)
 		else(PURPLE_NOT_RUNTIME)
 			add_definitions(-DPURPLE_RUNTIME=1)
 		endif(PURPLE_NOT_RUNTIME)
 	else()
 		add_definitions(-DPURPLE_RUNTIME=0)
 	endif()
 	# FIND LIBEVENT
 	find_package(event)
 endif()
 # FIND GLIB
 if(ENABLE_PURPLE)
 #	if (GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
 #		set(GLIB2_FOUND TRUE)
 #	else()
 		find_package(glib)
 #	endif()
 endif()
 # FIND LIBXML2
 # find_package(libxml2)
 # FIND PROTOBUF
 find_package(Protobuf REQUIRED)
 if (NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY)
 	set(PROTOBUF_FOUND 1)
 	set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR})
 	if (PROTOBUF_PROTOC_EXECUTABLE)
 	else()
 		set(PROTOBUF_PROTOC_EXECUTABLE protoc)
 	endif()
 	message(STATUS "Using protobuf: ${PROTOBUF_INCLUDE_DIRS} ${PROTOBUF_LIBRARY}")
 endif()
 find_package(jsoncpp REQUIRED)
 include_directories(${JSONCPP_INCLUDE_DIRS})
 if (WIN32)
 	add_definitions(-DSWIFTEN_STATIC=1)
 	ADD_DEFINITIONS(-D_WIN32_WINNT=0x0600)
 	ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
 	ADD_DEFINITIONS(-DBOOST_USE_WINDOWS_H)
 	ADD_DEFINITIONS(-D_UNICODE)
 	ADD_DEFINITIONS(-DUNICODE)
 endif()
 if (CMAKE_COMPILER_IS_GNUCXX)
 find_package(openssl)
 endif()
 if(ENABLE_IRC)
 	find_package(Communi)
 	INCLUDE(FindQt4)
 	FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)
 	# ADD_DEFINITIONS(${SWIFTEN_CFLAGS})
 	ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)
 	# ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
 endif()
 find_package(event)
 ####### Miscallanous ######
 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)
 	find_package(cppunit)
 	if(NOT CPPUNIT_FOUND AND CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
 		set(CCPUNIT_LIBRARIES ${CPPUNIT_LIBRARY})
 		set(CPPUNIT_FOUND 1)
 		message(STATUS "Using cppunit: ${CPPUNIT_INCLUDE_DIR} ${CPPUNIT_LIBRARIES}")
 	endif()
 endif()
 message("  Supported features")
 message("-----------------------")
 if (SPECTRUM_VERSION)
 	ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
 else (SPECTRUM_VERSION)
 	if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
 		if (NOT GIT_EXECUTABLE)
 		set (GIT_EXECUTABLE git)
 		endif()
 		execute_process(COMMAND ${GIT_EXECUTABLE} "--git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git" rev-parse --short HEAD
 						OUTPUT_VARIABLE GIT_REVISION
 						OUTPUT_STRIP_TRAILING_WHITESPACE
+		)
 		set(SPECTRUM_VERSION 2.0.x-git-${GIT_REVISION})
 		ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
 	else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
 		set(SPECTRUM_VERSION 2.0.9)
 		ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
 	endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
 endif (SPECTRUM_VERSION)
 message("Version           : " ${SPECTRUM_VERSION})
 if (SQLITE3_FOUND)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
 if (WIN32)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
 	message("SQLite3           : bundled")
 else (WIN32)
 	include_directories(${SQLITE3_INCLUDE_DIR})
 	message("SQLite3           : yes")
 endif (WIN32)
 else (SQLITE3_FOUND)
 	set(SQLITE3_LIBRARIES "")
 	if(ENABLE_SQLITE3)
 		message("SQLite3           : no (install sqlite3)")
 	else(ENABLE_SQLITE3)
 		message("SQLite3           : no (user disabled)")
 	endif()
 endif (SQLITE3_FOUND)
 if (MYSQL_FOUND)
 	ADD_DEFINITIONS(-DWITH_MYSQL)
 	include_directories(${MYSQL_INCLUDE_DIR})
 	message("MySQL             : yes")
 else (MYSQL_FOUND)
 	set(MYSQL_LIBRARIES "")
 	if(ENABLE_MYSQL)
 		message("MySQL             : no (install mysql-devel)")
 	else(ENABLE_MYSQL)
 		message("MySQL             : no (user disabled)")
 	endif()
 endif (MYSQL_FOUND)
 if (PQXX_FOUND)
 	ADD_DEFINITIONS(-DWITH_PQXX)
 	include_directories(${PQXX_INCLUDE_DIR})
 	message("PostgreSQL        : yes")
 else (PQXX_FOUND)
 	set(PQXX_LIBRARY "")
 	set(PQ_LIBRARY "")
 	if(ENABLE_PQXX)
 		message("PostgreSQL        : no (install libpqxx-devel)")
 	else(ENABLE_PQXX)
 		message("PostgreSQL        : no (user disabled)")
 	endif()
 endif (PQXX_FOUND)
 if (PROTOBUF_FOUND)
 	ADD_DEFINITIONS(-DWITH_PROTOBUF)
 	include_directories(${PROTOBUF_INCLUDE_DIRS})
 	message("Network plugins   : yes")
 	if(PURPLE_FOUND)
 		message("Libpurple plugin  : yes")
 		include_directories(${PURPLE_INCLUDE_DIR})
 		include_directories(${GLIB2_INCLUDE_DIR})
 	else()
 		if(ENABLE_PURPLE)
 			message("Libpurple plugin  : no (install libpurple)")
 		else(ENABLE_PURPLE)
 			message("Libpurple plugin  : no (user disabled)")
 		endif()

cmake_modules/Findlog4cxx.cmake

➞

Show inline comments

 # LOG4CXX_FOUND - system has liblog4cxx
 # LOG4CXX_INCLUDE_DIR - the liblog4cxx include directory
 # 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)
   #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)

0 comments (0 inline, 0 general)