From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Mon, 18 Mar 2019 16:26:57 +0000 (+0100)
Subject: Merge pull request #7019 from Icinga/feature/new-json-library
X-Git-Tag: v2.11.0-rc1~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ace8001d88fb62b1f13cce5f7041029d1fca956;p=icinga2

Merge pull request #7019 from Icinga/feature/new-json-library

Replace YAJL with nlohmann::json
---

6ace8001d88fb62b1f13cce5f7041029d1fca956
diff --cc CMakeLists.txt
index 20455cf81,e344784f8..e35735714
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -143,20 -143,10 +143,14 @@@ include_directories(${OPENSSL_INCLUDE_D
  set(base_DEPS ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
  set(base_OBJS $<TARGET_OBJECTS:mmatch> $<TARGET_OBJECTS:socketpair> $<TARGET_OBJECTS:base>)
  
- find_package(YAJL)
- 
- if(NOT YAJL_FOUND)
-   include_directories(${icinga2_BINARY_DIR}/third-party/yajl/include)
-   link_directories(${icinga2_BINARY_DIR}/third-party/yajl)
-   list(APPEND base_OBJS $<TARGET_OBJECTS:yajl>)
- else()
-   list(APPEND base_DEPS ${YAJL_LIBRARIES})
- endif()
+ # JSON
+ find_package(JSON)
+ include_directories(${JSON_INCLUDE})
  
 +# UTF8CPP
 +find_package(UTF8CPP)
 +include_directories(${UTF8CPP_INCLUDE})
 +
  find_package(Editline)
  set(HAVE_EDITLINE "${EDITLINE_FOUND}")