Skip to content

Commit

Permalink
Merge pull request #884 from skliper/fix881-ut-install-dir
Browse files Browse the repository at this point in the history
Fix #881, Install unit test to target directory
  • Loading branch information
yammajamma authored Sep 17, 2020
2 parents c3ab053 + 54449db commit 2546a81
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions fsw/cfe-core/unit-test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ foreach(MODULE ${CFE_CORE_MODULES})
ut_assert)

add_test(${UT_TARGET_NAME}_UT ${UT_TARGET_NAME}_UT)
foreach(TGTNAME ${TGTSYS_${SYSVAR}})
foreach(TGTNAME ${INSTALL_TARGET_LIST})
install(TARGETS ${UT_TARGET_NAME}_UT DESTINATION ${TGTNAME}/${UT_INSTALL_SUBDIR})
endforeach(TGTNAME ${TGTSYS_${SYSVAR}})
endforeach(TGTNAME ${INSTALL_TARGET_LIST})
endforeach(MODULE ${CFE_CORE_MODULES})

# Generate the FS test input files
Expand Down
4 changes: 3 additions & 1 deletion modules/msg/unit-test-coverage/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@ target_link_libraries(${DEP}_UT
ut_assert)

add_test(${DEP}_UT ${DEP}_UT)
install(TARGETS ${DEP}_UT DESTINATION ${TGTNAME}/${UT_INSTALL_SUBDIR})
foreach(TGT ${INSTALL_TARGET_LIST})
install(TARGETS ${DEP}_UT DESTINATION ${TGT}/${UT_INSTALL_SUBDIR})
endforeach()

0 comments on commit 2546a81

Please sign in to comment.