add submodule 'nlohmann/json'

3aa80a84 · Patrick Chen · cffcffec · 3aa80a84 · 3aa80a84 · 3aa80a84
Commit 3aa80a84 authored Aug 27, 2018 by Patrick Chen
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

.gitmodules .gitmodules +3 -0

Makefile Makefile +2 -1

xs-test.cpp src/xs-test.cpp +2 -1

json submodule/json +1 -0

No files found.
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "submodule/json"]
+	path = submodule/json
+	url = https://github.com/nlohmann/json.git
--- a/Makefile
+++ b/Makefile
 CXX=g++
 CXX_FLAGS=-g -std=c++14 \
          -I/usr/local/include \
-          -I./include
+          -I./include \
+          -I./submodule/json/single_include
 LD_FLAGS=-L/usr/local/lib \
         -lexchange_server
 BUILD_DIR=$(shell pwd)/build

--- a/src/xs-test.cpp
+++ b/src/xs-test.cpp
 #include <iostream>

-#include "Config.hpp"
+// #include "Config.hpp"
+#include "nlohmann/json.hpp"


 int main() {

--- a/json @ d713727f
+++ b/json @ d713727f
+Subproject commit d713727f2277f2eb919a2dbbfdd534f8988aa493