Integrate nlohmann_json into CMake

Better integration into base/json.cpp

Signed-off-by: Alexander A. Klimov <alexander.klimov@icinga.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3556d3a9672c58bf2462ceecb1cca9bd707e9827..9c5a4f469d766c846362ca29edcddfce85b94820 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,10 @@ else()
   list(APPEND base_DEPS ${YAJL_LIBRARIES})
 endif()
 
+# JSON
+find_package(JSON)
+include_directories(${JSON_INCLUDE})
+
 find_package(Editline)
 set(HAVE_EDITLINE "${EDITLINE_FOUND}")
 

diff --git a/cmake/FindJSON.cmake b/cmake/FindJSON.cmake
new file mode 100644 (file)
index 0000000..b7d5d79
--- /dev/null
+++ b/cmake/FindJSON.cmake
@@ -0,0 +1,9 @@
+FIND_PATH (JSON_INCLUDE json.hpp HINTS "${PROJECT_SOURCE_DIR}/third-party/nlohmann_json")
+
+if (JSON_INCLUDE)
+  set(JSON_BuildTests OFF CACHE INTERNAL "")
+
+  message(STATUS "Found JSON: ${JSON_INCLUDE}" )
+else ()
+  message(FATAL_ERROR "Unable to include json.hpp")
+endif ()

diff --git a/lib/base/json.cpp b/lib/base/json.cpp
index a9a1e5f561786fb23c0c33248d8161a69c5e574f..13cb143f873ce3a5f5c3b84c1aed6a44db7d1d9f 100644 (file)
--- a/lib/base/json.cpp
+++ b/lib/base/json.cpp
@@ -11,6 +11,7 @@
 #include <yajl/yajl_version.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_parse.h>
+#include <json.hpp>
 #include <stack>
 
 using namespace icinga;