From b5d324d07be3e19b415ee708ff1eeb701d9f06a7 Mon Sep 17 00:00:00 2001 From: lunarifish Date: Mon, 11 Nov 2024 22:35:55 +0800 Subject: [PATCH] remove librm --- .gitmodules | 3 --- CMakeLists.txt | 9 --------- libs/CMakeLists.txt | 9 --------- libs/librm | 1 - 4 files changed, 22 deletions(-) delete mode 100644 .gitmodules delete mode 100644 libs/CMakeLists.txt delete mode 160000 libs/librm diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 528539f..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libs/librm"] - path = libs/librm - url = https://github.com/IRobot-EC-2024/librm.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c11fcb3..dd7bca5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,6 @@ add_custom_target(ci DEPENDS ${CMAKE_PROJECT_NAME}) # for CI build testing # Add STM32CubeMX generated sources add_subdirectory(cmake/stm32cubemx) -add_subdirectory(${CMAKE_SOURCE_DIR}/libs) add_subdirectory(${CMAKE_SOURCE_DIR}/src) # Link directories setup @@ -66,16 +65,8 @@ target_link_libraries(${CMAKE_PROJECT_NAME} stm32cubemx # Add user defined libraries - ${PROJECT_NAME}_libs ) -# # Convert ELF to BIN for flashing -# add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD -# COMMAND ${CMAKE_OBJCOPY} -O binary ${CMAKE_PROJECT_NAME}.elf ${CMAKE_PROJECT_NAME}.bin -# DEPENDS ${CMAKE_PROJECT_NAME} -# COMMENT "Converting ELF to BIN" -# ) - # Add openocd functions include(${CMAKE_SOURCE_DIR}/openocd/flash-target.cmake) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt deleted file mode 100644 index f5954e2..0000000 --- a/libs/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - -# Pack all third-party libraries into a single target - -set(IROBOTEC_PLATFORM STM32) -add_subdirectory(librm) - -add_library(${PROJECT_NAME}_libs INTERFACE) -target_link_libraries(${PROJECT_NAME}_libs INTERFACE - rm) \ No newline at end of file diff --git a/libs/librm b/libs/librm deleted file mode 160000 index 8790735..0000000 --- a/libs/librm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8790735fa6063b327819e8cc4401be395d7a9c43