Merge pull request #884 from skliper/fix881-ut-install-dir

Fix #881, Install unit test to target directory
nasa · Sep 17, 2020 · 2546a81 · 2546a81
2 parents c3ab053 + 54449db
commit 2546a81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/fsw/cfe-core/unit-test/CMakeLists.txt b/fsw/cfe-core/unit-test/CMakeLists.txt
@@ -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

diff --git a/modules/msg/unit-test-coverage/CMakeLists.txt b/modules/msg/unit-test-coverage/CMakeLists.txt
@@ -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()