Now using external nlohmann json

Teemperor · Oct 24, 2017 · 1bade84 · 1bade84
1 parent ece20a4
commit 1bade84
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 13,006 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ arch:
     - google-glog
     - gtest
     - eigen3
+    - nlohmann-json
   script:
     - sudo chmod 777 -R /dev/shm/
     - ./scripts/run_tests.sh $CC $CXX -j4

diff --git a/files/nlohmann.json b/files/nlohmann.json
diff --git a/files/nlohmann_json.modulemap b/files/nlohmann_json.modulemap
@@ -0,0 +1 @@
+module nlohmann_json [system] { header "json.hpp" export * }
diff --git a/files/nlohmann_json2.modulemap b/files/nlohmann_json2.modulemap
@@ -0,0 +1 @@
+module nlohmann_json [system] { header "nlohmann/json.hpp" export * }
diff --git a/tests/compilation/nlohmann_json/NEEDS_PCMS b/tests/compilation/nlohmann_json/NEEDS_PCMS
@@ -1 +1 @@
-nlohmann_json
+nlohmann_json2