From 487ad85fad8f59555a44a877d5b68b3ada4ef0ad Mon Sep 17 00:00:00 2001 From: chain Date: Mon, 12 Nov 2012 21:18:15 +0100 Subject: [PATCH] make Twitter optional (by using ENABLE_TWITTER) --- CMakeLists.txt | 16 ++++++++++------ backends/CMakeLists.txt | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 213fc1e0..0147cf25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ option(ENABLE_PQXX "Build with Postgres supoort" 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_TWITTER "Build Twitter plugin" ON) option(ENABLE_YAHOO2 "Build Libyahoo2 plugin" ON) option(ENABLE_DOCS "Build Docs" ON) @@ -373,10 +373,16 @@ if (PROTOBUF_FOUND) message("Skype plugin : no (user disabled)") endif() endif() + if(ENABLE_TWITTER) + message("Twitter plugin : yes") + else(ENABLE_TWITTER) + message("Twitter plugin : no (user disabled)") + endif() else() - message("Frotz plugin : no") - message("SMSTools3 plugin : no") - message("Skype plugin : no") + 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)") + message("Twitter plugin : no (does not run on Win32)") endif() if(YAHOO2_FOUND) @@ -391,8 +397,6 @@ if (PROTOBUF_FOUND) endif() message("Swiften plugin : yes") - message("Twitter plugin : yes") - else() message("Network plugins : no (install libprotobuf-dev)") message("Libpurple plugin : no (install libpurple and libprotobuf-dev)") diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt index 3b843b1c..1306f711 100644 --- a/backends/CMakeLists.txt +++ b/backends/CMakeLists.txt @@ -18,7 +18,9 @@ if (NOT WIN32) if(YAHOO2_FOUND) ADD_SUBDIRECTORY(libyahoo2) endif() - ADD_SUBDIRECTORY(twitter) + if(ENABLE_TWITTER) + ADD_SUBDIRECTORY(twitter) + endif() if (${LIBDBUSGLIB_FOUND}) ADD_SUBDIRECTORY(skype) endif()