]> granicus.if.org Git - icinga2/commitdiff
Merge pull request #7019 from Icinga/feature/new-json-library
authorMichael Friedrich <michael.friedrich@icinga.com>
Mon, 18 Mar 2019 16:26:57 +0000 (17:26 +0100)
committerGitHub <noreply@github.com>
Mon, 18 Mar 2019 16:26:57 +0000 (17:26 +0100)
Replace YAJL with nlohmann::json

1  2 
CMakeLists.txt
doc/21-development.md
test/CMakeLists.txt

diff --cc CMakeLists.txt
index 20455cf8144619ae8e7e96dbc6ee72694aba4130,e344784f8e25eafd5b7343d8f133dd790ea9904d..e35735714c35a7d4bdee76ce9fea71733b2dde39
@@@ -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}")
  
Simple merge
Simple merge