Browse Source

update submodule and add vscode project setting

master
zhaohe 3 years ago
parent
commit
fc26a2fb4e
  1. 3
      .gitmodules
  2. 13
      .vscode/c_cpp_properties.json
  3. 7
      .vscode/settings.json
  4. 3
      CMakeLists.txt
  5. 1
      dep/asio1.12.2
  6. 2
      dep/zwebservice

3
.gitmodules

@ -16,3 +16,6 @@
[submodule "dep/websocketpp"]
path = dep/websocketpp
url = http://47.92.195.73/zlinux_demo_projects/websocketpp.git
[submodule "dep/asio1.12.2"]
path = dep/asio1.12.2
url = http://47.92.195.73/zlinux_demo_projects/asio1.12.2.git

13
.vscode/c_cpp_properties.json

@ -0,0 +1,13 @@
{
"configurations": [
{
"name": "Linux",
"compilerPath": "/usr/bin/g++",
"cStandard": "gnu11",
"cppStandard": "gnu++14",
"intelliSenseMode": "linux-gcc-x64",
"compileCommands": "${workspaceFolder}/build/compile_commands.json"
}
],
"version": 4
}

7
.vscode/settings.json

@ -91,6 +91,11 @@
"syncstream": "cpp",
"variant": "cpp",
"__nullptr": "cpp",
"__config": "cpp"
"__config": "cpp",
"__functional_base": "cpp",
"__functional_base_03": "cpp",
"__hash_table": "cpp",
"__tree": "cpp",
"__tuple": "cpp"
}
}

3
CMakeLists.txt

@ -30,7 +30,8 @@ message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/)
include(dep/iflytopcpp/module.cmake)
include(dep/websocketcpp/module.cmake)
include(dep/asio1.12.2/module.cmake)
include(dep/websocketpp/module.cmake)
include(dep/zservice_container/module.cmake)
include(dep/zwebservice/module.cmake)

1
dep/asio1.12.2

@ -0,0 +1 @@
Subproject commit 8dec127c936fa7d944e9fa090cfd7a7d60fd0151

2
dep/zwebservice

@ -1 +1 @@
Subproject commit b6a7215051c525f1dac7b7dca7e9b083f8420750
Subproject commit f4468c3342826fbe6fb693bfc2eb4b1fba12810c
Loading…
Cancel
Save