From 75f421209febe5485866d1b09916fbb04decf643 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 12 Dec 2016 19:21:18 -0800 Subject: build: fix Jansson detection --- cmake/modules/FindJansson.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'cmake/modules') diff --git a/cmake/modules/FindJansson.cmake b/cmake/modules/FindJansson.cmake index ea98f125a..feed563be 100644 --- a/cmake/modules/FindJansson.cmake +++ b/cmake/modules/FindJansson.cmake @@ -36,9 +36,8 @@ else() ${CMAKE_INSTALL_FULL_LIBDIR}) if(Jansson_INCLUDE_DIR AND EXISTS "${Jansson_INCLUDE_DIR}/jansson.h") - file(STRINGS "${Jansson_INCLUDE_DIR}/jansson.h" - REGEX "^#[ ]*define[ ]+JANSSON_VERSION[ ]+\".*\"" - jansson_version_str) + file(STRINGS "${Jansson_INCLUDE_DIR}/jansson.h" jansson_version_str + REGEX "^#[ ]*define[ ]+JANSSON_VERSION[ ]+\".*\"") string(REGEX REPLACE "^[ ]*define[ ]+JANSSON_VERSION[ ]+\"([^\"]*)\".*" "\\1" Jansson_VERSION_STRING "${jansson_version_str}") @@ -48,7 +47,7 @@ else() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Jansson REQUIRED_VARS - Jansson_INCLUDE_DIRS + Jansson_INCLUDE_DIR Jansson_LIBRARIES VERSION_VAR Jansson_VERSION_STRING) -- cgit v1.2.3