From 4d8d57ac8d69a04a086f1306a6ec07d91f82fe39 Mon Sep 17 00:00:00 2001 From: Alberto Villa Date: Thu, 10 Nov 2011 10:32:39 +0100 Subject: [PATCH] Revert "Delete our QJson CMake module" This reverts commit 8474a866367dab74feac51db44e6aeefce4827b3. Old versions of QJson don't ship with a CMake module, so we need to provide ours. --- cmake/modules/FindQJSON.cmake | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 cmake/modules/FindQJSON.cmake diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake new file mode 100644 index 00000000..a5b5c79a --- /dev/null +++ b/cmake/modules/FindQJSON.cmake @@ -0,0 +1,47 @@ +# Find QJSON - JSON handling library for Qt +# Source: http://gitorious.org/libmygpo-qt/libmygpo-qt/blobs/634b150fabdcafddcfb98a9a08cc414d95ae0dbe/cmake/modules/FindQJSON.cmake +# +# This module defines +# QJSON_FOUND - whether the qsjon library was found +# QJSON_LIBRARIES - the qjson library +# QJSON_INCLUDE_DIR - the include path of the qjson library +# + +if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) + + # Already in cache + set (QJSON_FOUND TRUE) + +else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) + + if (NOT WIN32) + # 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) + endif (NOT WIN32) + + find_library (QJSON_LIBRARIES + NAMES + qjson + PATHS + ${QJSON_LIBRARY_DIRS} + ${LIB_INSTALL_DIR} + ${KDE4_LIB_DIR} + ) + + find_path (QJSON_INCLUDE_DIR + NAMES + parser.h + PATH_SUFFIXES + qjson + PATHS + ${QJSON_INCLUDE_DIRS} + ${INCLUDE_INSTALL_DIR} + ${KDE4_INCLUDE_DIR} + ) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR) + +endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) -- 2.39.2