[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdeplasma-addons] /: make QtOAuth be optional. if unfound, don't build microblog engine
From:       Shaun Reich <shaun.reich () kdemail ! net>
Date:       2012-05-05 20:22:53
Message-ID: 20120505202253.04EAEA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 03da8cdf65b355e3ea67af330f1d4d21fab01c67 by Shaun Reich.
Committed on 05/05/2012 at 22:22.
Pushed by sreich into branch 'master'.

make QtOAuth be optional. if unfound, don't build microblog engine

CCMAIL:sebas@kde.org

M  +3    -0    CMakeLists.txt
M  +6    -3    dataengines/CMakeLists.txt
M  +0    -3    dataengines/microblog/CMakeLists.txt

http://commits.kde.org/kdeplasma-addons/03da8cdf65b355e3ea67af330f1d4d21fab=
01c67

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c638b22..f3a3042 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,9 @@ macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK)
 macro_optional_find_package(QJSON)
 macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, =
for parsing API responses" "" FALSE "" "")
 =

+macro_optional_find_package(QtOAuth)
+macro_log_feature(QTOAUTH_FOUND "QtOAuth" "QtOAuth Library - required to b=
uild the Plasma Microblog DataEngine" "https://github.com/ayoy/qoauth" FALS=
E "" "Needed for building Plasma Microblog DataEngine")
+
 macro_optional_depend_package(Marble "Marble")
 if (DEPEND_PACKAGE_Marble)
   macro_optional_find_package(Marble)
diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
index 398ce60..c86be79 100644
--- a/dataengines/CMakeLists.txt
+++ b/dataengines/CMakeLists.txt
@@ -1,10 +1,13 @@
 add_subdirectory(comic)
-if(QCA2_FOUND)
-  add_subdirectory(microblog)
-endif(QCA2_FOUND)
+
+if (QCA2_FOUND AND QTOAUTH_FOUND)
+      add_subdirectory(microblog)
+endif(QCA2_FOUND AND QTOAUTH_FOUND)
+
 if(LIBATTICA_FOUND)
   add_subdirectory(ocs)
 endif(LIBATTICA_FOUND)
+
 add_subdirectory(potd)
 add_subdirectory(rememberthemilk)
 add_subdirectory(kdeobservatory)
diff --git a/dataengines/microblog/CMakeLists.txt b/dataengines/microblog/C=
MakeLists.txt
index 678b662..38c530b 100644
--- a/dataengines/microblog/CMakeLists.txt
+++ b/dataengines/microblog/CMakeLists.txt
@@ -2,9 +2,6 @@
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDE=
S}
 ${QT_QTNETWORK_INCLUDES} ${QT_QTXML_INCLUDES} ${QCA2_INCLUDE_DIR})
 =

-find_package(QCA2 REQUIRED)
-find_package(QtOAuth REQUIRED)
-
 set(twitter_engine_SRCS
     imagesource.cpp
     usersource.cpp
[prev in list] [next in list] [prev in thread] [next in thread]