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

List:       kde-panel-devel
Subject:    Re: Re: QJSON a mandatory dependency to kde-workspaces?
From:       Martin =?ISO-8859-1?Q?Gr=E4=DFlin?= <mgraesslin () kde ! org>
Date:       2012-08-31 7:01:21
Message-ID: 1642369.oYJo8AGUh2 () martin-desktop
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


On Friday 31 August 2012 08:48:20 Marco Gulino wrote:
> My fault, sorry... I just forgot about that additional dependency. I think
> I'll be able to fix it today or tomorrow, by simply disabling chrome
> support when QJSON is not found.
> Small problem: there is no builtin  CMake script for QJSON, there's one
> around that works quite fine, however, I've been using it for other project.
> Should I add this script to kde-workspace? where exactly?
Yes I think it is needed. I just wanted to move the check and run into an 
issue becauase qjson_FOUND is not set.

I stop then my work on it as it's better to just exclude the Chrome support. 
My current patch to kde-workspace is attached, maybe it's a good starting 
point for you. The FindQJSON.cmake file should go to cmake/modules.

Thanks for taking care of it

Martin
["qjson.diff" (qjson.diff)]

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 781d2c3..9257383 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,9 @@ macro_log_feature(Akonadi_FOUND "Akonadi" "An extensible \
cross-desktop storage s  macro_optional_find_package(KdepimLibs 4.5.60)
 macro_log_feature(KdepimLibs_FOUND "KDE PIM Libs" "KDE Libraries for PIM" \
"http://pim.kde.org/" FALSE "4.5.60" "Required to build certain Plasma DataEngines \
(Akonadi, Calendar)")  
+macro_optional_find_package(QJSON)
+macro_log_feature(qjson_FOUND, "QJson" "Library to manage JSON objects with Qt" \
"http://qjson.sourceforge.net/" FALSE "" "Required to build certain Plasma Runners \
(Bookmarks)") +
 
 include(ConfigureChecks.cmake)
 if(NOT WIN32)
diff --git a/plasma/generic/runners/CMakeLists.txt \
b/plasma/generic/runners/CMakeLists.txt index 4a8d234..d52d52b 100644
--- a/plasma/generic/runners/CMakeLists.txt
+++ b/plasma/generic/runners/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_subdirectory(activities)
-add_subdirectory(bookmarks)
+if(qjson_FOUND)
+    add_subdirectory(bookmarks)
+endif(qjson_FOUND)
 add_subdirectory(calculator)
 add_subdirectory(locations)
 add_subdirectory(places)
diff --git a/plasma/generic/runners/bookmarks/CMakeLists.txt \
b/plasma/generic/runners/bookmarks/CMakeLists.txt index c339068..b24b66b 100644
--- a/plasma/generic/runners/bookmarks/CMakeLists.txt
+++ b/plasma/generic/runners/bookmarks/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 ########### next target ###############
-find_package(QJSON REQUIRED)
 include_directories(${QJSON_INCLUDE_DIR})
 
 set(krunner_bookmarksrunner_SRCS


["signature.asc" (application/pgp-signature)]

_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel


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