X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=cmake%2FFindQJSON.cmake;h=cd007e15c3af3e00be18b970312d4bd2136fa11b;hb=b25c4b9fccc76976d633bc5b183a84553ab01998;hp=32e294ffd5771a4cf40a5fcd79f730bb83a7f1bd;hpb=959f1afcfb10c71b5ae564b73db23493fae9e991;p=apitrace

diff --git a/cmake/FindQJSON.cmake b/cmake/FindQJSON.cmake
index 32e294f..cd007e1 100644
--- a/cmake/FindQJSON.cmake
+++ b/cmake/FindQJSON.cmake
@@ -17,25 +17,23 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
     # use pkg-config to get the values of QJSON_INCLUDE_DIRS
     # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
     include (FindPkgConfig)
-    pkg_check_modules (QJSON REQUIRED QJson>=0.5)
+    pkg_check_modules (PC_QJSON QJson>=0.5)
   endif (NOT WIN32)
 
   find_library (QJSON_LIBRARIES
     NAMES
     qjson
     PATHS
-    ${QJSON_LIBRARY_DIRS}
+    ${PC_QJSON_LIBRARY_DIRS}
     ${LIB_INSTALL_DIR}
     ${KDE4_LIB_DIR}
   )
 
   find_path (QJSON_INCLUDE_DIR
     NAMES
-    parser.h
-    PATH_SUFFIXES
-    qjson
+    qjson/parser.h
     PATHS
-    ${QJSON_INCLUDE_DIRS}
+    ${PC_QJSON_INCLUDE_DIRS}
     ${INCLUDE_INSTALL_DIR}
     ${KDE4_INCLUDE_DIR}
   )