From 305f594af2496b76fbe34520f7078cc4bbd3b155 Mon Sep 17 00:00:00 2001 From: Damiano Amatruda <damiano.amatruda@skywarder.eu> Date: Mon, 4 Apr 2022 21:00:46 +0200 Subject: [PATCH] [submodules] Update submodules --- cmake/boardcore-host.cmake | 4 ++-- cmake/boardcore.cmake | 6 +++--- cmake/dependencies.cmake | 1 + cmake/sbs.cmake | 4 ++-- libs/miosix-host | 2 +- libs/miosix-kernel | 2 +- libs/mxgui | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cmake/boardcore-host.cmake b/cmake/boardcore-host.cmake index 361902c48..712ef9698 100644 --- a/cmake/boardcore-host.cmake +++ b/cmake/boardcore-host.cmake @@ -56,10 +56,10 @@ add_library(boardcore-host STATIC EXCLUDE_FROM_ALL # TestUtils ${SBS_BASE}/src/shared/utils/testutils/TestHelper.cpp ) -add_library(SkywardBoardcore::Boardcore-host ALIAS boardcore-host) +add_library(SkywardBoardcore::Boardcore::host ALIAS boardcore-host) target_include_directories(boardcore-host PUBLIC ${SBS_BASE}/src/shared) target_link_libraries(boardcore-host PUBLIC - Miosix::Miosix-host + Miosix::Miosix::host TSCPP::TSCPP Eigen3::Eigen fmt::fmt-header-only diff --git a/cmake/boardcore.cmake b/cmake/boardcore.cmake index da871c9f4..010cf2b3c 100644 --- a/cmake/boardcore.cmake +++ b/cmake/boardcore.cmake @@ -90,11 +90,11 @@ foreach(OPT_BOARD ${BOARDS}) # TestUtils ${SBS_BASE}/src/shared/utils/testutils/TestHelper.cpp ) - add_library(SkywardBoardcore::Boardcore-${OPT_BOARD} ALIAS ${BOARDCORE_LIBRARY}) + add_library(SkywardBoardcore::Boardcore::${OPT_BOARD} ALIAS ${BOARDCORE_LIBRARY}) target_include_directories(${BOARDCORE_LIBRARY} PUBLIC ${SBS_BASE}/src/shared) target_link_libraries(${BOARDCORE_LIBRARY} PUBLIC - Miosix::Miosix-${OPT_BOARD} - Mxgui::Mxgui-${OPT_BOARD} + Miosix::Miosix::${OPT_BOARD} + Mxgui::Mxgui::${OPT_BOARD} TSCPP::TSCPP Eigen3::Eigen fmt::fmt-header-only diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 1043f7536..5e77e8cd8 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -28,6 +28,7 @@ include(${KPATH}/config/boards.cmake) add_subdirectory(${SBS_BASE}/libs/miosix-host EXCLUDE_FROM_ALL) +set(KPATH ${KPATH} CACHE PATH "Path to kernel directory") add_subdirectory(${SBS_BASE}/libs/mxgui EXCLUDE_FROM_ALL) add_subdirectory(${SBS_BASE}/libs/tscpp EXCLUDE_FROM_ALL) diff --git a/cmake/sbs.cmake b/cmake/sbs.cmake index 17f5f3ef5..e3d206573 100644 --- a/cmake/sbs.cmake +++ b/cmake/sbs.cmake @@ -47,7 +47,7 @@ function(sbs_target TARGET OPT_BOARD) endif() target_include_directories(${TARGET} PRIVATE src/shared) if(CMAKE_CROSSCOMPILING) - target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore-${OPT_BOARD}) + target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore::${OPT_BOARD}) add_custom_command( TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_OBJCOPY} -O ihex ${TARGET} ${TARGET}.hex @@ -56,7 +56,7 @@ function(sbs_target TARGET OPT_BOARD) VERBATIM ) else() - target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore-host) + target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore::host) endif() endfunction() diff --git a/libs/miosix-host b/libs/miosix-host index f93e4e7f8..ed8a4d8c2 160000 --- a/libs/miosix-host +++ b/libs/miosix-host @@ -1 +1 @@ -Subproject commit f93e4e7f8025322c365e649cad96b65faf9d6ab5 +Subproject commit ed8a4d8c24e59ce7513b1cebc9b6427fde55c7ce diff --git a/libs/miosix-kernel b/libs/miosix-kernel index a5d535dd5..f30922ec6 160000 --- a/libs/miosix-kernel +++ b/libs/miosix-kernel @@ -1 +1 @@ -Subproject commit a5d535dd506f30399edb3e315de41e2f97e87c4b +Subproject commit f30922ec62a9db5cd0835b7c231ca846b52fcc3a diff --git a/libs/mxgui b/libs/mxgui index 3c3954db3..a3f44e0cc 160000 --- a/libs/mxgui +++ b/libs/mxgui @@ -1 +1 @@ -Subproject commit 3c3954db30418264863e8dda93ef3f8a91e00695 +Subproject commit a3f44e0cc0c7965f947b18621470d22fcabddc7b -- GitLab