libtransport.git Changeset - 1548f91d4022

Changeset - 1548f91d4022

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Chel Sea (chain) - 13 years ago 2012-11-12 02:41:17
chain@rpgfiction.net

Make Libyahoo2 backend optional (by using ENABLE_YAHOO2)

2 files changed with 15 insertions and 16 deletions:

CMakeLists.txt

backends/CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -21,13 +21,13 @@ option(ENABLE_PQXX "Build with Postgres supoort" ON) @@
 #option(ENABLE_FROTZ "Build Frotz plugin" ON)
 option(ENABLE_IRC "Build IRC plugin" ON)
 option(ENABLE_PURPLE "Build Libpurple plugin" ON)
 option(ENABLE_SKYPE "Build Skype plugin" ON)
 #option(ENABLE_TWITTER "Build Twitter plugin" ON)
-#option(ENABLE_YAHOO2 "Build Yahoo plugin" ON)
+option(ENABLE_YAHOO2 "Build Libyahoo2 plugin" ON)
 option(ENABLE_DOCS "Build Docs" ON)
 option(ENABLE_LOG "Build with logging using Log4cxx" ON)
 option(ENABLE_TESTS "Build Tests using CppUnit" ON)
 MACRO(LIST_CONTAINS var value)
@@ @@ -208,16 +208,16 @@ 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()
@@ @@ -376,23 +376,22 @@ if (PROTOBUF_FOUND) @@
 	else()
 		message("Frotz plugin      : no")
 		message("SMSTools3 plugin  : no")
 		message("Skype plugin      : no")
 	endif()
 #	We have our own copy now...
 # 	if(YAHOO2_FOUND)
 	if(ENABLE_YAHOO2)
  	if(YAHOO2_FOUND)
 		message("Libyahoo2 plugin  : yes")
-# 		include_directories(${YAHOO2_INCLUDE_DIR})
  		include_directories(${YAHOO2_INCLUDE_DIR})
 	else()
 		message("Libyahoo2 plugin  : no")
 	endif()
 # 	else()
 # 		message("Libyahoo2 plugin  : no (install libyahoo2-devel)")
 # 	endif()
 		if(ENABLE_YAHOO2)
 			message("Libyahoo2 plugin  : no (install libyahoo2-devel)")
 		else(ENABLE_YAHOO2)
 			message("Libyahoo2 plugin  : no (user disabled)")
 		endif()
  	endif()
 	message("Swiften plugin    : yes")
     message("Twitter plugin    : yes")
 else()
 	message("Network plugins   : no (install libprotobuf-dev)")

backends/CMakeLists.txt

➞

Show inline comments

@@ @@ -12,15 +12,15 @@ if (PROTOBUF_FOUND) @@
 	ADD_SUBDIRECTORY(template)
 if (NOT WIN32)
 	ADD_SUBDIRECTORY(smstools3)
 	ADD_SUBDIRECTORY(frotz)
-# 	if(YAHOO2_FOUND)
  	if(YAHOO2_FOUND)
 		ADD_SUBDIRECTORY(libyahoo2)
-# 	endif()
  	endif()
 	ADD_SUBDIRECTORY(twitter)
 	if (${LIBDBUSGLIB_FOUND})
 		ADD_SUBDIRECTORY(skype)
 	endif()
 endif()

0 comments (0 inline, 0 general)