Skip to content
Snippets Groups Projects
Commit 305f594a authored by Damiano Amatruda's avatar Damiano Amatruda
Browse files

[submodules] Update submodules

parent bcd0e2d9
No related branches found
No related tags found
No related merge requests found
...@@ -56,10 +56,10 @@ add_library(boardcore-host STATIC EXCLUDE_FROM_ALL ...@@ -56,10 +56,10 @@ add_library(boardcore-host STATIC EXCLUDE_FROM_ALL
# TestUtils # TestUtils
${SBS_BASE}/src/shared/utils/testutils/TestHelper.cpp ${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_include_directories(boardcore-host PUBLIC ${SBS_BASE}/src/shared)
target_link_libraries(boardcore-host PUBLIC target_link_libraries(boardcore-host PUBLIC
Miosix::Miosix-host Miosix::Miosix::host
TSCPP::TSCPP TSCPP::TSCPP
Eigen3::Eigen Eigen3::Eigen
fmt::fmt-header-only fmt::fmt-header-only
......
...@@ -90,11 +90,11 @@ foreach(OPT_BOARD ${BOARDS}) ...@@ -90,11 +90,11 @@ foreach(OPT_BOARD ${BOARDS})
# TestUtils # TestUtils
${SBS_BASE}/src/shared/utils/testutils/TestHelper.cpp ${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_include_directories(${BOARDCORE_LIBRARY} PUBLIC ${SBS_BASE}/src/shared)
target_link_libraries(${BOARDCORE_LIBRARY} PUBLIC target_link_libraries(${BOARDCORE_LIBRARY} PUBLIC
Miosix::Miosix-${OPT_BOARD} Miosix::Miosix::${OPT_BOARD}
Mxgui::Mxgui-${OPT_BOARD} Mxgui::Mxgui::${OPT_BOARD}
TSCPP::TSCPP TSCPP::TSCPP
Eigen3::Eigen Eigen3::Eigen
fmt::fmt-header-only fmt::fmt-header-only
......
...@@ -28,6 +28,7 @@ include(${KPATH}/config/boards.cmake) ...@@ -28,6 +28,7 @@ include(${KPATH}/config/boards.cmake)
add_subdirectory(${SBS_BASE}/libs/miosix-host EXCLUDE_FROM_ALL) 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/mxgui EXCLUDE_FROM_ALL)
add_subdirectory(${SBS_BASE}/libs/tscpp EXCLUDE_FROM_ALL) add_subdirectory(${SBS_BASE}/libs/tscpp EXCLUDE_FROM_ALL)
......
...@@ -47,7 +47,7 @@ function(sbs_target TARGET OPT_BOARD) ...@@ -47,7 +47,7 @@ function(sbs_target TARGET OPT_BOARD)
endif() endif()
target_include_directories(${TARGET} PRIVATE src/shared) target_include_directories(${TARGET} PRIVATE src/shared)
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore-${OPT_BOARD}) target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore::${OPT_BOARD})
add_custom_command( add_custom_command(
TARGET ${TARGET} POST_BUILD TARGET ${TARGET} POST_BUILD
COMMAND ${CMAKE_OBJCOPY} -O ihex ${TARGET} ${TARGET}.hex COMMAND ${CMAKE_OBJCOPY} -O ihex ${TARGET} ${TARGET}.hex
...@@ -56,7 +56,7 @@ function(sbs_target TARGET OPT_BOARD) ...@@ -56,7 +56,7 @@ function(sbs_target TARGET OPT_BOARD)
VERBATIM VERBATIM
) )
else() else()
target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore-host) target_link_libraries(${TARGET} PRIVATE SkywardBoardcore::Boardcore::host)
endif() endif()
endfunction() endfunction()
......
Subproject commit f93e4e7f8025322c365e649cad96b65faf9d6ab5 Subproject commit ed8a4d8c24e59ce7513b1cebc9b6427fde55c7ce
Subproject commit a5d535dd506f30399edb3e315de41e2f97e87c4b Subproject commit f30922ec62a9db5cd0835b7c231ca846b52fcc3a
Subproject commit 3c3954db30418264863e8dda93ef3f8a91e00695 Subproject commit a3f44e0cc0c7965f947b18621470d22fcabddc7b
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment