Skip to content

Commit 1d22fd1

Browse files
remove cpp_rsc git submodule
1 parent db8b411 commit 1d22fd1

File tree

4 files changed

+0
-29
lines changed

4 files changed

+0
-29
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@
77
[submodule "mavsdk-proto"]
88
path = proto
99
url = https://github.com/mavlink/MAVSDK-Proto.git
10-
[submodule "third_party/cpp_rsc"]
11-
path = src/third_party/cpp_rsc
12-
url = https://github.com/orex/cpp_rsc.git

src/CMakeLists.txt

-12
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ include(cmake/compiler_flags.cmake)
3131
find_package(CURL REQUIRED CONFIG)
3232
find_package(tinyxml2 REQUIRED)
3333

34-
if(NOT MSVC AND NOT MINGW)
35-
cmake_policy(SET CMP0058 NEW)
36-
include(${CMAKE_CURRENT_SOURCE_DIR}/third_party/cpp_rsc/cmake/modules/cpp_resource.cmake)
37-
if(NOT ANDROID AND NOT IOS)
38-
# If not cross-compiling, we can build cpp_rsc.
39-
add_subdirectory(third_party/cpp_rsc/src EXCLUDE_FROM_ALL)
40-
else()
41-
# For cross-compilation, re-use the binary from default.
42-
set_property(GLOBAL PROPERTY CPPRSC_CMD ${CMAKE_CURRENT_BINARY_DIR}/../../default/src/third_party/cpp_rsc/src/cpp_rsc)
43-
endif()
44-
endif()
45-
4634
if(BUILD_TESTS AND (IOS OR ANDROID))
4735
message(STATUS "Building for iOS or Android: forcing BUILD_TESTS to FALSE...")
4836
set(BUILD_TESTS OFF)

src/plugins/camera/CMakeLists.txt

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
if(NOT MSVC AND NOT MINGW)
2-
add_resource(camera_definition_files)
3-
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/e90.xml VARIABLE e90xml TEXT)
4-
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/e50.xml VARIABLE e50xml TEXT)
5-
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/cgoet.xml VARIABLE cgoetxml TEXT)
6-
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/e10t.xml VARIABLE e10txml TEXT)
7-
8-
get_property(RSC_CPP_FILE TARGET camera_definition_files PROPERTY _AR_SRC_FILE)
9-
get_property(RSC_H_DIR TARGET camera_definition_files PROPERTY _AR_H_DIR)
10-
11-
include_directories(${RSC_H_DIR})
12-
endif()
13-
141
add_library(mavsdk_camera
152
camera.cpp
163
camera_impl.cpp

src/third_party/cpp_rsc

-1
This file was deleted.

0 commit comments

Comments
 (0)