Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ jobs:
python3 -m pip install wheel
python3 -m pip install future
- name: configure
run: cmake $superbuild $cmake_prefix_path -DENABLE_STRICT_TRY_COMPILE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$(pwd)/tools/ios.toolchain.cmake -DPLATFORM=${{ matrix.platform }} -DDEPLOYMENT_TARGET=13.0 -DBUILD_MAVSDK_SERVER=ON -DBUILD_SHARED_LIBS=OFF -DWERROR=OFF -Bbuild/${{ matrix.name }} -H.
run: cmake $superbuild $cmake_prefix_path -DENABLE_STRICT_TRY_COMPILE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$(pwd)/tools/ios.toolchain.cmake -DENABLE_BITCODE=Off -DPLATFORM=${{ matrix.platform }} -DDEPLOYMENT_TARGET=14.0 -DBUILD_MAVSDK_SERVER=ON -DBUILD_SHARED_LIBS=OFF -DWERROR=OFF -Bbuild/${{ matrix.name }} -H.
- name: build
run: cmake --build build/${{ matrix.name }} -j2
- uses: actions/upload-artifact@v3
Expand Down
29 changes: 8 additions & 21 deletions src/mavsdk_server/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,23 @@
cmake_minimum_required(VERSION 3.10.2)

list(APPEND MAVSDK_SERVER_SOURCES
mavsdk_server_api.h
mavsdk_server_api.cpp
mavsdk_server.cpp
grpc_server.cpp
)

set(COMPONENTS_LIST ${ENABLED_PLUGINS})
list(APPEND COMPONENTS_LIST core)

foreach(COMPONENT_NAME ${COMPONENTS_LIST})
add_library(${COMPONENT_NAME}_proto_gens STATIC
list(APPEND MAVSDK_SERVER_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/generated/${COMPONENT_NAME}/${COMPONENT_NAME}.grpc.pb.cc
${CMAKE_CURRENT_SOURCE_DIR}/generated/${COMPONENT_NAME}/${COMPONENT_NAME}.pb.cc
${CMAKE_CURRENT_SOURCE_DIR}/generated/mavsdk_options.grpc.pb.cc
${CMAKE_CURRENT_SOURCE_DIR}/generated/mavsdk_options.pb.cc
)

target_link_libraries(${COMPONENT_NAME}_proto_gens
gRPC::grpc++
)

target_include_directories(${COMPONENT_NAME}_proto_gens
PRIVATE
${PROJECT_SOURCE_DIR}/mavsdk_server/src/generated
)

list(APPEND COMPONENTS_PROTOGENS ${COMPONENT_NAME}_proto_gens)
endforeach()

set(MAVSDK_SERVER_SOURCES
mavsdk_server_api.h
mavsdk_server_api.cpp
mavsdk_server.cpp
grpc_server.cpp
)

if(IOS OR (APPLE AND MACOS_FRAMEWORK))
set_property(SOURCE module.modulemap
PROPERTY MACOSX_PACKAGE_LOCATION "Modules")
Expand All @@ -47,7 +35,6 @@ target_link_libraries(mavsdk_server
PRIVATE
mavsdk
gRPC::grpc++
${COMPONENTS_PROTOGENS}
)

if(BUILD_WITH_PROTO_REFLECTION)
Expand Down
26 changes: 13 additions & 13 deletions src/mavsdk_server/src/generated/action/action.grpc.pb.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions src/mavsdk_server/src/generated/action/action.grpc.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading