libtransport.git Changeset - d1a34a733320

Changeset - d1a34a733320

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 13 years ago 2013-01-16 22:03:56
hanzz.k@gmail.com

use bundled libyahoo2

1 file changed with 11 insertions and 10 deletions:

CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -169,100 +169,100 @@ endif() @@
 # set(libxml2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 # find_package(libxml2)
 # FIND PROTOBUF
 set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 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()
 if (WIN32)
 	add_definitions(-DSWIFTEN_STATIC=1)
 	ADD_DEFINITIONS(-D_UNICODE)
 	ADD_DEFINITIONS(-DUNICODE)
 endif()
 if (CMAKE_COMPILER_IS_GNUCXX)
 set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(openssl)
 endif()
 if(ENABLE_IRC)
 	set(Communi_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	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()
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)
 if (NOT WIN32 AND ENABLE_SKYPE)
 set(dbus_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(dbus)
 endif()
 if(ENABLE_YAHOO2)
 	set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(yahoo2)
 endif()
 #if(ENABLE_YAHOO2)
 #	set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 #	find_package(yahoo2)
 #endif()
 ####### 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()
 # FIND CPPUNIT
 if(ENABLE_TESTS)
 	set(cppunit_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	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.0-beta-git-${GIT_REVISION})
 		ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")
 	else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
 		set(SPECTRUM_VERSION 2.0.0-alpha)
@@ @@ -345,106 +345,107 @@ if (PROTOBUF_FOUND) @@
 		endif()
 	endif()
 	if(IRC_FOUND)
 		ADD_DEFINITIONS(-DCOMMUNI_SHARED)
 		message("IRC plugin        : yes")
 		include_directories(${QT_QTNETWORK_INCLUDE_DIR})
 		include_directories(${IRC_INCLUDE_DIR})
 		include(${QT_USE_FILE})
 	else()
 		if(ENABLE_IRC)
 			message("IRC plugin        : no (install libCommuni and libprotobuf-dev)")
 		else(ENABLE_IRC)
 			message("IRC plugin        : no (user disabled)")
 		endif()
 	endif()
 	if(ENABLE_TWITTER)
 		message("Twitter plugin    : yes")
 	else(ENABLE_TWITTER)
 		message("Twitter plugin    : no (user disabled)")
 	endif()
 	if (NOT WIN32)
 		if(ENABLE_FROTZ)
 			message("Frotz plugin      : yes")
 		else()
 			message("Frotz plugin      : no (user disabled)")
 		endif()
 		if(ENABLE_SMSTOOLS3)
 			message("SMSTools3 plugin  : yes")
 		else()
 			message("SMSTools3 plugin  : no (user disabled)")
 		endif()
 		if(${LIBDBUSGLIB_FOUND})
 			message("Skype plugin      : yes")
 			include_directories(${LIBDBUSGLIB_INCLUDE_DIRS})
 		else()
 			if(ENABLE_SKYPE)
 				message("Skype plugin      : no (install dbus-glib-devel)")
 			else(ENABLE_SKYPE)
 				message("Skype plugin      : no (user disabled)")
 			endif()
 		endif()
 	else()
 		message("Frotz plugin      : no (does not run on Win32)")
 		message("SMSTools3 plugin  : no (does not run on Win32)")
 		message("Skype plugin      : no (does not run on Win32)")
 	endif()
  	if(YAHOO2_FOUND)
 		message("Libyahoo2 plugin  : yes")
  		include_directories(${YAHOO2_INCLUDE_DIR})
 	else()
 #  	if(YAHOO2_FOUND)
 # 		message("Libyahoo2 plugin  : yes")
 #  		include_directories(${YAHOO2_INCLUDE_DIR})
 # 	else()
 		if(ENABLE_YAHOO2)
 			message("Libyahoo2 plugin  : no (install libyahoo2-devel)")
 			set(YAHOO2_FOUND 1)
 			message("Libyahoo2 plugin  : yes")
 		else(ENABLE_YAHOO2)
 			message("Libyahoo2 plugin  : no (user disabled)")
 		endif()
  	endif()
+#  	endif()
 	if(ENABLE_SWIFTEN)
 		message("Swiften plugin    : yes")
 	else()
 		message("Swiften plugin    : no (user disabled)")
 	endif()
 else()
 	message("Network plugins   : no (install libprotobuf-dev)")
 	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")
 	message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")
 	message("Frotz plugin      : no (install libprotobuf-dev)")
 	message("SMSTools3 plugin  : no (install libprotobuf-dev)")
 	message("Swiften plugin    : no (install libprotobuf-dev)")
     message("Twitter plugin    : no (install libprotobuf-dev)")
 endif()
 if (LOG4CXX_FOUND)
 	message("Log4cxx           : yes")
 	include_directories(${LOG4CXX_INCLUDE_DIR})
 	ADD_DEFINITIONS(-DWITH_LOG4CXX)
 else()
 	set(LOG4CXX_LIBRARIES "")
 	if(ENABLE_LOG)
 		message("Log4cxx           : no (install log4cxx-devel)")
 	else(ENABLE_LOG)
 		message("Log4cxx           : no (user disabled)")
 	endif()
 endif()
 if (WIN32)
 	ADD_DEFINITIONS(-DLOG4CXX_STATIC)
 	ADD_DEFINITIONS(-D_WIN32_WINNT=0x501)
 	ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
 	ADD_DEFINITIONS(-DBOOST_USE_WINDOWS_H)
 	ADD_DEFINITIONS(-DBOOST_THREAD_USE_LIB)
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	if (CMAKE_COMPILER_IS_GNUCXX)
 		ADD_DEFINITIONS(-O0)
 		ADD_DEFINITIONS(-ggdb)
 	endif()
 	ADD_DEFINITIONS(-DDEBUG)
 	message("Debug             : yes")
 else(CMAKE_BUILD_TYPE MATCHES Debug)
 	message("Debug             : no (run \"cmake . -DCMAKE_BUILD_TYPE=Debug\")")
 endif(CMAKE_BUILD_TYPE MATCHES Debug)

0 comments (0 inline, 0 general)