From 667bf14a15cd3c7e771e8bc0da615ee6c1bfa3bb Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Thu, 2 Aug 2018 22:19:52 -0500
Subject: [PATCH] Added json helpers and installation of nlohmann/json.hpp
modified: CMakeLists.txt modified: THcParmList.cxx renamed:
json.hpp -> nlohmann/json.hpp
---
src/CMakeLists.txt | 1 +
src/THcParmList.cxx | 2 +-
src/{ => nlohmann}/json.hpp | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename src/{ => nlohmann}/json.hpp (100%)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 151419e..9e2f440 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,6 +89,7 @@ install(TARGETS ${LIBNAME}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(FILES ${allheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(DIRECTORY nlohmann DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
#----------------------------------------------------------------------------
# libHallCDict
diff --git a/src/THcParmList.cxx b/src/THcParmList.cxx
index 28cd2eb..4e0a781 100644
--- a/src/THcParmList.cxx
+++ b/src/THcParmList.cxx
@@ -25,7 +25,7 @@ An instance of THaTextvars is created to hold the string parameters.
#include <iomanip>
#include "TBufferJSON.h"
-#include "json.hpp"
+#include "nlohmann/json.hpp"
#include "TObjArray.h"
#include "TObjString.h"
#include "TSystem.h"
diff --git a/src/json.hpp b/src/nlohmann/json.hpp
similarity index 100%
rename from src/json.hpp
rename to src/nlohmann/json.hpp
--
GitLab