From 54449dba0801108d61b75036090b49d82ca580f6 Mon Sep 17 00:00:00 2001
From: Jacob Hageman <jacob.hageman@nasa.gov>
Date: Fri, 11 Sep 2020 13:05:30 -0400
Subject: [PATCH] Fix #881, Install unit test to target directory

---
 fsw/cfe-core/unit-test/CMakeLists.txt         | 4 ++--
 modules/msg/unit-test-coverage/CMakeLists.txt | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fsw/cfe-core/unit-test/CMakeLists.txt b/fsw/cfe-core/unit-test/CMakeLists.txt
index 0ef508a38..a61043a71 100644
--- 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
index 5449769c4..8a5fe49e2 100644
--- 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()