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

List:       kde-commits
Subject:    [kdeplasma-addons] /: runner cmake fixes
From:       Shaun Reich <shaun.reich () kdemail ! net>
Date:       2012-03-03 14:43:26
Message-ID: 20120303144326.89352A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 096b06888d41078a958761d5e82f3191c57636f9 by Shaun Reich.
Committed on 03/03/2012 at 15:43.
Pushed by sreich into branch 'master'.

runner cmake fixes

M  +6    -2    CMakeLists.txt
M  +1    -0    cmake/CMakeLists.txt

http://commits.kde.org/kdeplasma-addons/096b06888d41078a958761d5e82f3191c57=
636f9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 620d5e4..c638b22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK)
 =

 =

 macro_optional_find_package(QJSON)
-macro_log_feature(QJSON_FOUND "QJSon" "Used for DuckDuckGo KRunner plugin"=
 "INSERT URL HERE" FALSE "" "")
+macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, =
for parsing API responses" "" FALSE "" "")
 =

 macro_optional_depend_package(Marble "Marble")
 if (DEPEND_PACKAGE_Marble)
@@ -57,7 +57,11 @@ include_directories (${KDE4_INCLUDES}
 add_subdirectory(libs)
 add_subdirectory(applets)
 add_subdirectory(dataengines)
-add_subdirectory(runners)
+
+if (QJSON_FOUND)
+    add_subdirectory(runners)
+endif (QJSON_FOUND)
+
 add_subdirectory(scriptengines)
 add_subdirectory(wallpapers)
 add_subdirectory(containments)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 94e8fb3..52d08a4 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -5,6 +5,7 @@ set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules )
 set(cmakeFiles
                FindLancelot.cmake
                FindLancelot-Datamodels.cmake
+               FindQJSON.cmake
                )
 =

 install(FILES ${cmakeFiles}
[prev in list] [next in list] [prev in thread] [next in thread]