Update FindQJSON.cmake to the latest version.

[apitrace] / cmake / FindQJSON.cmake

diff --git a/cmake/FindQJSON.cmake b/cmake/FindQJSON.cmake
index a7ca1d9c1967b269aefb524f7146229595172e71..cd007e15c3af3e00be18b970312d4bd2136fa11b 100644 (file)
--- 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 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}
   )