From ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 9 May 2015 01:22:33 +0100
Subject: Updated and submodularised JsonCPP

Conflicts:
	lib/jsoncpp
---
 lib/jsoncpp                |  1 +
 lib/jsoncpp/CMakeLists.txt | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 create mode 160000 lib/jsoncpp
 delete mode 100644 lib/jsoncpp/CMakeLists.txt

(limited to 'lib/jsoncpp/CMakeLists.txt')

diff --git a/lib/jsoncpp b/lib/jsoncpp
new file mode 160000
index 000000000..5256551b0
--- /dev/null
+++ b/lib/jsoncpp
@@ -0,0 +1 @@
+Subproject commit 5256551b0307d3e85f453faf1b1822b1d859f949
diff --git a/lib/jsoncpp/CMakeLists.txt b/lib/jsoncpp/CMakeLists.txt
deleted file mode 100644
index 6c678f6a6..000000000
--- a/lib/jsoncpp/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-cmake_minimum_required (VERSION 2.6)
-project (jsoncpp)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
-
-file(GLOB SOURCE
-    "src/lib_json/*.h"
-    "src/lib_json/*.cpp"
-)
-
-
-add_library(jsoncpp ${SOURCE})
-- 
cgit v1.2.3