Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/cppcheck-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ jobs:
fprime-util generate -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
fprime-util build --all --jobs "$(nproc || printf '%s\n' 1)"
# Since our subtopologies have EXCLUDE_FROM_ALL, we need to explicitly build them
# Add EXCLUDE_FROM_ALL targets as we need to explicitly build them
fprime-util build --target Svc_Subtopologies --jobs "$(nproc || printf '%s\n' 1)"
fprime-util build --target Svc_GenericHub --jobs "$(nproc || printf '%s\n' 1)"
echo CPPCHECK_OPTS=--project="$GITHUB_WORKSPACE/build-fprime-automatic-native/compile_commands.json" >> $GITHUB_ENV
- name: Run cppcheck
Expand Down
30 changes: 15 additions & 15 deletions Svc/GenericHub/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@
#
####

set(SOURCE_FILES
"${CMAKE_CURRENT_LIST_DIR}/GenericHub.fpp"
"${CMAKE_CURRENT_LIST_DIR}/GenericHubComponentImpl.cpp"
register_fprime_module(
AUTOCODER_INPUTS
"${CMAKE_CURRENT_LIST_DIR}/GenericHub.fpp"
SOURCES
"${CMAKE_CURRENT_LIST_DIR}/GenericHubComponentImpl.cpp"
EXCLUDE_FROM_ALL
)

register_fprime_module()
### UTs ###
set(UT_SOURCE_FILES
"${CMAKE_CURRENT_LIST_DIR}/GenericHub.fpp"
"${CMAKE_CURRENT_LIST_DIR}/test/ut/GenericHubTestMain.cpp"
"${CMAKE_CURRENT_LIST_DIR}/test/ut/GenericHubTester.cpp"
)
set(UT_MOD_DEPS
Fw/Com
STest
register_fprime_ut(
AUTOCODER_INPUTS
"${CMAKE_CURRENT_LIST_DIR}/GenericHub.fpp"
SOURCES
"${CMAKE_CURRENT_LIST_DIR}/test/ut/GenericHubTestMain.cpp"
"${CMAKE_CURRENT_LIST_DIR}/test/ut/GenericHubTester.cpp"
DEPENDS
Fw_Com
STest
)

register_fprime_ut()
set (UT_TARGET_NAME "${FPRIME_CURRENT_MODULE}_ut_exe")
if (TARGET "${UT_TARGET_NAME}")
target_compile_options("${UT_TARGET_NAME}" PRIVATE -Wno-conversion)
Expand Down
Loading