From f3508f82c166ed077cf1dece2be98410d55e54bf Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Jan 2015 21:35:23 -0500
Subject: [PATCH] Add jsonxx to depends/

---
 .gitmodules            | 3 +++
 CMakeLists.txt         | 1 +
 depends/CMakeLists.txt | 3 ++-
 depends/jsonxx         | 1 +
 library/CMakeLists.txt | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 160000 depends/jsonxx

diff --git a/.gitmodules b/.gitmodules
index b20d189ec..fec9215c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "depends/clsocket"]
 	path = depends/clsocket
 	url = git://github.com/DFHack/clsocket.git
+[submodule "depends/jsonxx"]
+	path = depends/jsonxx
+	url = https://github.com/lethosor/jsonxx
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ed6621b4..a529084b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,7 @@ find_package(ZLIB REQUIRED)
 include_directories(depends/protobuf)
 include_directories(depends/lua/include)
 include_directories(depends/md5)
+include_directories(depends/jsonxx)
 include_directories(depends/tinyxml)
 include_directories(depends/tthread)
 include_directories(${ZLIB_INCLUDE_DIRS})
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 4f091ed63..804ca09de 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -4,8 +4,9 @@ add_subdirectory(md5)
 add_subdirectory(protobuf)
 add_subdirectory(tinyxml)
 add_subdirectory(tthread)
+add_subdirectory(jsonxx)
 # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.
 OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
 OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
 add_subdirectory(clsocket)
-IDE_FOLDER(clsocket "Depends")
\ No newline at end of file
+IDE_FOLDER(clsocket "Depends")
diff --git a/depends/jsonxx b/depends/jsonxx
new file mode 160000
index 000000000..1d1adf4ea
--- /dev/null
+++ b/depends/jsonxx
@@ -0,0 +1 @@
+Subproject commit 1d1adf4ea438fdcc0da108f6c9bd2a250fbd3f58
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 69bf4d63a..e7bad75cf 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -294,7 +294,7 @@ IF(APPLE)
     SET_TARGET_PROPERTIES(dfhack PROPERTIES SOVERSION 1.0.0)
 ENDIF()
 
-TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket lua dfhack-version ${PROJECT_LIBS})
+TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket lua jsonxx dfhack-version ${PROJECT_LIBS})
 SET_TARGET_PROPERTIES(dfhack PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
 TARGET_LINK_LIBRARIES(dfhack-client protobuf-lite clsocket)