Skip to content

Commit 6373790

Browse files
committed
JsonCpp is no more a submodule
1 parent 42e4d05 commit 6373790

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "3rd/auss"]
22
path = 3rd/auss
33
url = https://github.com/drmgc/auss.git
4-
[submodule "3rd/jsoncpp"]
5-
path = 3rd/jsoncpp
6-
url = https://github.com/open-source-parsers/jsoncpp

3rd/jsoncpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

CMakeLists.txt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,20 @@ project(i3ipc++)
44
option(I3IPCpp_WITH_TESTS "Build unit tests executables" OFF)
55
option(I3IPCpp_BUILD_EXAMPLES "Build example executables" OFF)
66

7-
set(BUILD_STATIC_LIBS ON)
8-
set(BUILD_SHARED_LIBS OFF)
9-
add_subdirectory(3rd/jsoncpp)
10-
UNSET(BUILD_STATIC_LIBS)
11-
UNSET(BUILD_SHARED_LIBS)
12-
137
find_package(PkgConfig)
148
pkg_check_modules(SIGCPP REQUIRED sigc++-2.0)
9+
pkg_check_modules(JSONCPP REQUIRED jsoncpp)
1510

1611
include_directories(
1712
${SIGCPP_INCLUDE_DIRS}
18-
3rd/jsoncpp/include
13+
${JSONCPP_INCLUDE_DIRS}
1914
3rd/auss/include
2015
include/i3ipc++
2116
)
2217

2318
link_directories(
2419
${SIGCPP_LIBRARY_DIRS}
25-
3rd/jsoncpp/src/lib_json/
20+
${JSONCPP_LIBRARY_DIRS}
2621
)
2722

2823
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wno-unused-parameter")
@@ -38,7 +33,7 @@ set(I3IPCpp_INCLUDE_DIRS
3833
3rd/auss/include
3934
${CMAKE_CURRENT_SOURCE_DIR}/include/
4035
)
41-
set(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} jsoncpp_lib_static)
36+
set(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} ${JSONCPP_LIBRARIES})
4237

4338
set(I3IPCpp_LIBRARY_DIRS ${I3IPCpp_LIBRARY_DIRS} PARENT_SCOPE)
4439
set(I3IPCpp_INCLUDE_DIRS ${I3IPCpp_INCLUDE_DIRS} PARENT_SCOPE)

0 commit comments

Comments
 (0)