From 7f8c1bb5cddc37aaccebbf5ef9f46b2fc7300392 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Fri, 27 Oct 2017 08:18:00 -0400 Subject: Merge pull request #1438 from mariusor/explicit_json-c_version Explicitly setting the version of json-c required --- CMake/FindJsonC.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'CMake') diff --git a/CMake/FindJsonC.cmake b/CMake/FindJsonC.cmake index 2ca0df39..bbf6930c 100644 --- a/CMake/FindJsonC.cmake +++ b/CMake/FindJsonC.cmake @@ -8,10 +8,22 @@ # find_package(PkgConfig) -pkg_check_modules(PC_JSONC QUIET JSONC) + +if (JsonC_FIND_REQUIRED) + set(_pkgconfig_REQUIRED "REQUIRED") +else() + set(_pkgconfig_REQUIRED "") +endif() + +if(JsonC_FIND_VERSION) + pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c=${JsonC_FIND_VERSION}) +else() + pkg_check_modules(PC_JSONC ${_pkgconfig_REQUIRED} json-c) +endif() + find_path(JSONC_INCLUDE_DIRS NAMES json-c/json.h HINTS ${PC_JSONC_INCLUDE_DIRS}) find_library(JSONC_LIBRARIES NAMES json-c HINTS ${PC_JSONC_LIBRARY_DIRS}) - include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(JSONC DEFAULT_MSG JSONC_LIBRARIES JSONC_INCLUDE_DIRS) mark_as_advanced(JSONC_LIBRARIES JSONC_INCLUDE_DIRS) -- cgit v1.2.3