[#42,#73,#95,#102] Refactor to use nlohmann-json and qpid-cpp

Also, complete clang-tidy and clang-format refactor Also also, removed of json wrapper tokens Co-authored-by: Markus Kitsinger (SwooshyCueb) <[email protected]>
irods · Nov 7, 2022 · f0de03e · f0de03e
1 parent 5083ff5
commit f0de03e
Show file tree

Hide file tree

Showing 6 changed files with 459 additions and 425 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.vscode
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,6 @@ include(IrodsRunpathDefaults)
 
 include(IrodsExternals)
 
-IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(JANSSON jansson2.7-0)
 IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(QPID_PROTON qpid-proton0.36.0-1)
 
 string(REPLACE ";" ", " ${PLUGIN}_PACKAGE_DEPENDENCIES_STRING "${IRODS_PACKAGE_DEPENDENCIES_LIST}")
@@ -47,7 +46,6 @@ target_include_directories(
   ${IRODS_EXTERNALS_FULLPATH_ARCHIVE}/include
   ${IRODS_EXTERNALS_FULLPATH_BOOST}/include
   ${IRODS_EXTERNALS_FULLPATH_FMT}/include
-  ${IRODS_EXTERNALS_FULLPATH_JANSSON}/include
   ${IRODS_EXTERNALS_FULLPATH_QPID_PROTON}/include
   )
 
@@ -56,8 +54,8 @@ target_link_libraries(
   PRIVATE
   irods_server
   irods_common
-  ${IRODS_EXTERNALS_FULLPATH_JANSSON}/lib/libjansson.so
-  ${IRODS_EXTERNALS_FULLPATH_QPID_PROTON}/lib/libqpid-proton.so
+  nlohmann_json::nlohmann_json
+  ${IRODS_EXTERNALS_FULLPATH_QPID_PROTON}/lib/libqpid-proton-cpp.so
   ${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_regex.so
   ${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so
   dl