amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

使用submodule方式添加jsoncpp源码

Browse Source
This commit is contained in:
ziyue 2022-10-16 21:10:18 +08:00
parent 8d80582f89
commit eac5a5b1dc
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "3rdpart/media-server"]
path = 3rdpart/media-server
url = https://gitee.com/ireader/media-server
[submodule "3rdpart/jsoncpp"]
path = 3rdpart/jsoncpp
url = https://gitee.com/mirrors/jsoncpp.git

3
.gitmodules_github
View File

@ -4,3 +4,6 @@
[submodule "3rdpart/media-server"]
path = 3rdpart/media-server
url = https://github.com/ireader/media-server
[submodule "3rdpart/jsoncpp"]
path = 3rdpart/jsoncpp
url = https://github.com/open-source-parsers/jsoncpp.git

6
3rdpart/CMakeLists.txt
View File

@ -24,15 +24,15 @@
##############################################################################
# jsoncpp
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp JSONCPP_SRC_LIST)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/src/lib_json JSONCPP_SRC_LIST)
add_library(jsoncpp STATIC ${JSONCPP_SRC_LIST})
target_compile_options(jsoncpp
PRIVATE ${COMPILE_OPTIONS_DEFAULT})
target_include_directories(jsoncpp
PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/jsoncpp/include"
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/jsoncpp/include")
update_cached_list(MK_LINK_LIBRARIES jsoncpp)

1
3rdpart/jsoncpp Submodule

@ -0,0 +1 @@
Subproject commit 8190e061bc2d95da37479a638aa2c9e483e58ec6

2
server/WebApi.h
View File

@ -13,7 +13,7 @@
#include <string>
#include <functional>
#include "jsoncpp/json.h"
#include "json/json.h"
#include "Common/Parser.h"
#include "Network/Socket.h"
#include "Http/HttpSession.h"

2
server/WebHook.h
View File

@ -13,7 +13,7 @@
#include <string>
#include <functional>
#include "jsoncpp/json.h"
#include "json/json.h"
//支持json或urlencoded方式传输参数
#define JSON_ARGS