New dependency for kdelibs and kdebase: dbusmenu-qt

[Christoph Feck]

On Sunday 25 April 2010 22:45:56 Aurélien Gâteau wrote:
> I just committed support for DBusMenu in kdelibs and kdebase.

Some issues I noticed:

* dbusmenu-qt fails to build

In FindQJSON.cmake, you try to find the include file "parser.h", but later 
include <qjson/parser.h>. This then fails with the error "include file 
qjson/parser.h not found", because it apparently tries to look at 
"qjson/qjson/parser.h". I had to change FindQJSON.cmake. Diff below.

* kdelibs fails to build

I am not entirely sure if my guess is right, but there seems to be some 
inconsistency with the prefix name for dbusmenu-qt ("DBusMenu-Qt" vs. 
"DBusMenuQt"). When running cmake in kdelibs, i get a message that dbusmenu-qt 
version 0.3.2 is found, then later it claims that required dependency 
dbusmenu-qt is not installed (but it is).

I only checked the changes in kdelibs quickly; I noticed that you use include 
"stuff" instead of include <stuff> to include the dependend dbusmenu headers; 
since this is an external requirement, it should use the angle brackets.

Thanks,
Christoph Feck (kdepepo)

diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
index a7ca1d9..0b066d4 100644
--- a/cmake/modules/FindQJSON.cmake
+++ b/cmake/modules/FindQJSON.cmake
@@ -31,9 +31,7 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
 
   find_path (QJSON_INCLUDE_DIR
     NAMES
-    parser.h
-    PATH_SUFFIXES
-    qjson
+    qjson/parser.h
     PATHS
     ${QJSON_INCLUDE_DIRS}
     ${INCLUDE_INSTALL_DIR}