henry/SimControl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Submodules

Browse Source
This commit is contained in:
Henry Winkel
2024-03-07 18:24:19 +01:00
parent 14e4fddab4
commit ae9dc2fa97
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -4,9 +4,6 @@
[submodule "build/libs/SimCore/libs/whisper-comm"] [submodule "build/libs/SimCore/libs/whisper-comm"]
path = build/libs/SimCore/libs/whisper-comm path = build/libs/SimCore/libs/whisper-comm
url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/whisper-com.git url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/whisper-com.git
[submodule "libs/OrderLibrary"]
path = libs/OrderLibrary
url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/OrderLibrary.git
[submodule "libs/ixwebsocket"] [submodule "libs/ixwebsocket"]
path = libs/ixwebsocket path = libs/ixwebsocket
url = https://github.com/machinezone/IXWebSocket.git url = https://github.com/machinezone/IXWebSocket.git
@@ -16,3 +13,6 @@
[submodule "libs/easywsclient"] [submodule "libs/easywsclient"]
path = libs/easywsclient path = libs/easywsclient
url = https://github.com/dhbaird/easywsclient.git url = https://github.com/dhbaird/easywsclient.git
[submodule "libs/OrderLibrary"]
path = libs/OrderLibrary
url = ssh://git@dev-gitea.ftewa.ti.unibw-hamburg.de:12000/hwinkel/OrderLibrary.git

4
cmake/Modules/protobuf.cmake
View File

@@ -15,7 +15,7 @@ function(protobuf_generate_cpp)
${ARGN}) ${ARGN})
FILE(GLOB PROTO_FILES ${protobuf_PROTO_PATH}/*.proto) FILE(GLOB PROTO_FILES ${protobuf_PROTO_PATH}/*.proto)
set(PROTOC ${CMAKE_BINARY_DIR}/libs/OrderLibrary/libs/SimCore/libs/whisper-com/libs/protobuf/protoc) set(PROTOC ${CMAKE_BINARY_DIR}/libs/OrderLibrary/libs/SimCore/libs/SimCom/libs/protobuf/protoc)
message(STATUS "protoc path: " ${PROTOC}) message(STATUS "protoc path: " ${PROTOC})
FOREACH(proto ${PROTO_FILES}) FOREACH(proto ${PROTO_FILES})
@@ -28,7 +28,7 @@ function(protobuf_generate_cpp)
add_custom_command( add_custom_command(
OUTPUT "${protoDIR}/${protoFILENAME}.pb.cc" OUTPUT "${protoDIR}/${protoFILENAME}.pb.cc"
DEPENDS "${protoDIR}/${protoFILENAME}.proto" DEPENDS "${protoDIR}/${protoFILENAME}.proto"
COMMAND ${PROTOC} --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/include/SimCore/Messages/Protos" --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/libs/whisper-com/libs/protobuf/src" "${protoDIR}/${protoFILENAME}.proto" COMMAND ${PROTOC} --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/include/SimCore/Messages/Protos" --proto_path="${CMAKE_SOURCE_DIR}/libs/OrderLibrary/libs/SimCore/libs/SimCom/libs/protobuf/src" "${protoDIR}/${protoFILENAME}.proto"
) )

2
libs/OrderLibrary

Submodule libs/OrderLibrary updated: 13f3c07dbc...107fcccbf6