From 63737906c8a0b3583bd33cfb5776436d5aa52353 Mon Sep 17 00:00:00 2001
From: Sergey Naumov <drmgc@yandex.ru>
Date: Sun, 4 Sep 2016 17:51:41 +0300
Subject: [PATCH] JsonCpp is no more a submodule

---
 .gitmodules    |  3 ---
 3rd/jsoncpp    |  1 -
 CMakeLists.txt | 13 ++++---------
 3 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 160000 3rd/jsoncpp

diff --git a/.gitmodules b/.gitmodules
index 80f831c..b1171d0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "3rd/auss"]
 	path = 3rd/auss
 	url = https://github.com/drmgc/auss.git
-[submodule "3rd/jsoncpp"]
-	path = 3rd/jsoncpp
-	url = https://github.com/open-source-parsers/jsoncpp
diff --git a/3rd/jsoncpp b/3rd/jsoncpp
deleted file mode 160000
index 9234cbb..0000000
--- a/3rd/jsoncpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9234cbbc90d1f6c70dd5a90b4d533779e45c820c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d956298..f2b6aca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,25 +4,20 @@ project(i3ipc++)
 option(I3IPCpp_WITH_TESTS "Build unit tests executables" OFF)
 option(I3IPCpp_BUILD_EXAMPLES "Build example executables" OFF)
 
-set(BUILD_STATIC_LIBS ON)
-set(BUILD_SHARED_LIBS OFF)
-add_subdirectory(3rd/jsoncpp)
-UNSET(BUILD_STATIC_LIBS)
-UNSET(BUILD_SHARED_LIBS)
-
 find_package(PkgConfig)
 pkg_check_modules(SIGCPP REQUIRED sigc++-2.0)
+pkg_check_modules(JSONCPP REQUIRED jsoncpp)
 
 include_directories(
 	${SIGCPP_INCLUDE_DIRS}
-	3rd/jsoncpp/include
+	${JSONCPP_INCLUDE_DIRS}
 	3rd/auss/include
 	include/i3ipc++
 )
 
 link_directories(
 	${SIGCPP_LIBRARY_DIRS}
-	3rd/jsoncpp/src/lib_json/
+	${JSONCPP_LIBRARY_DIRS}
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wno-unused-parameter")
@@ -38,7 +33,7 @@ set(I3IPCpp_INCLUDE_DIRS
 	3rd/auss/include
 	${CMAKE_CURRENT_SOURCE_DIR}/include/
 )
-set(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} jsoncpp_lib_static)
+set(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} ${JSONCPP_LIBRARIES})
 
 set(I3IPCpp_LIBRARY_DIRS ${I3IPCpp_LIBRARY_DIRS} PARENT_SCOPE)
 set(I3IPCpp_INCLUDE_DIRS ${I3IPCpp_INCLUDE_DIRS} PARENT_SCOPE)