Skip to content

Commit

Permalink
remove cpp_rsc git submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasVautherin committed Aug 13, 2019
1 parent db8b411 commit 1d22fd1
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 29 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@
[submodule "mavsdk-proto"]
path = proto
url = https://github.com/mavlink/MAVSDK-Proto.git
[submodule "third_party/cpp_rsc"]
path = src/third_party/cpp_rsc
url = https://github.com/orex/cpp_rsc.git
12 changes: 0 additions & 12 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,6 @@ include(cmake/compiler_flags.cmake)
find_package(CURL REQUIRED CONFIG)
find_package(tinyxml2 REQUIRED)

if(NOT MSVC AND NOT MINGW)
cmake_policy(SET CMP0058 NEW)
include(${CMAKE_CURRENT_SOURCE_DIR}/third_party/cpp_rsc/cmake/modules/cpp_resource.cmake)
if(NOT ANDROID AND NOT IOS)
# If not cross-compiling, we can build cpp_rsc.
add_subdirectory(third_party/cpp_rsc/src EXCLUDE_FROM_ALL)
else()
# For cross-compilation, re-use the binary from default.
set_property(GLOBAL PROPERTY CPPRSC_CMD ${CMAKE_CURRENT_BINARY_DIR}/../../default/src/third_party/cpp_rsc/src/cpp_rsc)
endif()
endif()

if(BUILD_TESTS AND (IOS OR ANDROID))
message(STATUS "Building for iOS or Android: forcing BUILD_TESTS to FALSE...")
set(BUILD_TESTS OFF)
Expand Down
13 changes: 0 additions & 13 deletions src/plugins/camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
if(NOT MSVC AND NOT MINGW)
add_resource(camera_definition_files)
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/e90.xml VARIABLE e90xml TEXT)
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/e50.xml VARIABLE e50xml TEXT)
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/cgoet.xml VARIABLE cgoetxml TEXT)
link_resource_file(camera_definition_files FILE ${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/e10t.xml VARIABLE e10txml TEXT)

get_property(RSC_CPP_FILE TARGET camera_definition_files PROPERTY _AR_SRC_FILE)
get_property(RSC_H_DIR TARGET camera_definition_files PROPERTY _AR_H_DIR)

include_directories(${RSC_H_DIR})
endif()

add_library(mavsdk_camera
camera.cpp
camera_impl.cpp
Expand Down
1 change: 0 additions & 1 deletion src/third_party/cpp_rsc
Submodule cpp_rsc deleted from 928ad8

0 comments on commit 1d22fd1

Please sign in to comment.