From 227bcf49c5aa2dd308c65573c4405d1a3cc4245f Mon Sep 17 00:00:00 2001 From: PonomarevDA Date: Sun, 30 Jun 2024 13:37:29 +0300 Subject: [PATCH] [TEMP] update submodules --- CMakeLists.txt | 2 +- Libs/Dronecan | 2 +- Libs/libparams | 2 +- Src/cyphal_application/CMakeLists.txt | 1 - Src/dronecan_application/CMakeLists.txt | 2 -- Src/platform/stm32f103/CMakeLists.txt | 1 + Src/platform/ubuntu/CMakeLists.txt | 1 + 7 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 560ac12..f508013 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,6 @@ else() message(SEND_ERROR "CAN_PROTOCOL is unknown.") endif() -include(${LIBPARAMS_PATH}/CMakeLists.txt) include(${APPLICATION_DIR}/CMakeLists.txt) # Set compile options @@ -64,4 +63,5 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() +add_subdirectory(${LIBPARAMS_PATH} ${CMAKE_BINARY_DIR}/libparams) add_subdirectory(${ROOT_DIR}/Src/platform/${APP_PLATFORM}) diff --git a/Libs/Dronecan b/Libs/Dronecan index 7c7a93f..2f01e74 160000 --- a/Libs/Dronecan +++ b/Libs/Dronecan @@ -1 +1 @@ -Subproject commit 7c7a93f96fa1838a64da5992560f8ff740784317 +Subproject commit 2f01e74b896407f45e7320ecd4cb5d34ebae5c19 diff --git a/Libs/libparams b/Libs/libparams index 83285a5..4779f0b 160000 --- a/Libs/libparams +++ b/Libs/libparams @@ -1 +1 @@ -Subproject commit 83285a5ccf7ad24977b61f4da5cecd3ee8b39003 +Subproject commit 4779f0b5a35811e305d45abaf2b9af23d69dcf67 diff --git a/Src/cyphal_application/CMakeLists.txt b/Src/cyphal_application/CMakeLists.txt index 1c00abc..b754324 100644 --- a/Src/cyphal_application/CMakeLists.txt +++ b/Src/cyphal_application/CMakeLists.txt @@ -23,7 +23,6 @@ set(APPLICATION_HEADERS ${ROOT_DIR}/Libs/Cyphal ${ROOT_DIR}/Libs/Cyphal/Cyphal ${ROOT_DIR}/Libs/Cyphal/Libs/libcanard/libcanard - ${ROOT_DIR}/Libs/libparams/libparams ${ROOT_DIR}/Libs/Cyphal/Libs/o1heap/o1heap ${ROOT_DIR}/build/nunavut_out diff --git a/Src/dronecan_application/CMakeLists.txt b/Src/dronecan_application/CMakeLists.txt index ef185ef..6b8784f 100644 --- a/Src/dronecan_application/CMakeLists.txt +++ b/Src/dronecan_application/CMakeLists.txt @@ -9,7 +9,6 @@ add_definitions(-DFLASH_DRIVER_STORAGE_FILE="${CMAKE_CURRENT_LIST_DIR}/default_p include(${ROOT_DIR}/Libs/Dronecan/CMakeLists.txt) set(APPLICATION_SOURCES - ${libparamsSrc} ${DRONECAN_SOURCES} ${ROOT_DIR}/Src/dronecan_application/application.cpp ${ROOT_DIR}/Src/dronecan_application/modules/circuit_status/CircuitStatusModule.cpp @@ -18,7 +17,6 @@ set(APPLICATION_SOURCES ) set(APPLICATION_HEADERS - ${libparamsHeaders} ${DRONECAN_HEADERS} ${ROOT_DIR}/Src ${ROOT_DIR}/Src/dronecan_application diff --git a/Src/platform/stm32f103/CMakeLists.txt b/Src/platform/stm32f103/CMakeLists.txt index 6c5c1ed..e562643 100644 --- a/Src/platform/stm32f103/CMakeLists.txt +++ b/Src/platform/stm32f103/CMakeLists.txt @@ -19,6 +19,7 @@ add_executable(${EXECUTABLE} ${driversSources} ${startupFile} ) +target_link_libraries(${EXECUTABLE} libparams) target_include_directories(${EXECUTABLE} PRIVATE ${BUILD_SRC_DIR} diff --git a/Src/platform/ubuntu/CMakeLists.txt b/Src/platform/ubuntu/CMakeLists.txt index 06d3985..fadedb7 100644 --- a/Src/platform/ubuntu/CMakeLists.txt +++ b/Src/platform/ubuntu/CMakeLists.txt @@ -15,6 +15,7 @@ add_executable(${EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/temperature_sensor.cpp ${CMAKE_CURRENT_LIST_DIR}/platform_specific.cpp ) +target_link_libraries(${EXECUTABLE} libparams) target_include_directories(${EXECUTABLE} PRIVATE ${BUILD_SRC_DIR}