привет, зоопарк веток control_system_client! зато теперь вебка должна собираться для всех модемов из одной ветки
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -1,3 +1,9 @@
|
||||
[submodule "dependencies/control_system_client"]
|
||||
path = dependencies/control_system_client
|
||||
url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git
|
||||
[submodule "dependencies/control_system_client_tdma"]
|
||||
path = dependencies/control_system_client_tdma
|
||||
url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git
|
||||
[submodule "dependencies/control_system_client_shps"]
|
||||
path = dependencies/control_system_client_shps
|
||||
url = http://gitlab.devrss.vg/mf-tdma/protocol_processing/control_system_client.git
|
||||
|
@@ -18,12 +18,15 @@ endif()
|
||||
if("${MODEM_TYPE}" STREQUAL "SCPC")
|
||||
add_definitions(-DMODEM_IS_SCPC)
|
||||
message(STATUS "Selected SCPC modem")
|
||||
add_subdirectory(dependencies/control_system_client) # подключение правильного control system client SCPC, ветка main
|
||||
elseif ("${MODEM_TYPE}" STREQUAL "TDMA")
|
||||
add_definitions(-DMODEM_IS_TDMA)
|
||||
message(STATUS "Selected TDMA modem")
|
||||
add_subdirectory(dependencies/control_system_client_tdma) # подключение правильного control system client TDMA, ветка terminal-tdma
|
||||
elseif ("${MODEM_TYPE}" STREQUAL "SHPS")
|
||||
add_definitions(-DMODEM_IS_SHPS)
|
||||
message(STATUS "Selected SHPS modem")
|
||||
add_subdirectory(dependencies/control_system_client_shps) # подключение правильного control system client SHPS, ветка shps
|
||||
else()
|
||||
message(FATAL_ERROR "You must set `MODEM_TYPE` \"SCPC\" or \"TDMA\" or \"SHPS\"!")
|
||||
endif()
|
||||
@@ -52,7 +55,6 @@ add_compile_options(-Wall -Wextra -Wsign-conversion -DPROJECT_GIT_REVISION="${PR
|
||||
# максимальный размер тела запроса 200mb
|
||||
add_definitions(-DHTTP_MAX_PAYLOAD=200000000)
|
||||
|
||||
add_subdirectory(dependencies/control_system_client)
|
||||
|
||||
include_directories(src/)
|
||||
|
||||
|
2
dependencies/control_system_client
vendored
2
dependencies/control_system_client
vendored
Submodule dependencies/control_system_client updated: cb0f743535...76d6dcdb08
1
dependencies/control_system_client_shps
vendored
Submodule
1
dependencies/control_system_client_shps
vendored
Submodule
Submodule dependencies/control_system_client_shps added at 92fcb8ab67
1
dependencies/control_system_client_tdma
vendored
Submodule
1
dependencies/control_system_client_tdma
vendored
Submodule
Submodule dependencies/control_system_client_tdma added at cb0f743535
Reference in New Issue
Block a user