Merge pull request #32 from nasa/integration-candidate

Integration Candidate: 2020-09-16
nasa · Sep 22, 2020 · 633df50 · 633df50
2 parents ce70d3d + 0168073
commit 633df50
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ sample_lib implements SAMPLE_Function, as an example for how to build and link a
 
 ## Version History
 
+### Development Build: v1.2.0-rc1+dev3
+
+- Installs unit test to target directory.
+- See <https://github.com/nasa/sample_lib/pull/32>
+
 ### Development Build: 1.1.0+dev27
 
 - Install unit test as part of cmake recipe. Sample lib test runner now shows up in expected install directory

diff --git a/fsw/src/sample_lib_version.h b/fsw/src/sample_lib_version.h
@@ -32,8 +32,8 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_LIB_BUILD_NUMBER 27 /*!< Development Build: Number of commits since baseline */
-#define SAMPLE_LIB_BUILD_BASELINE "v1.1.0" /*!< Development Build: git tag that is the base for the current development */
+#define SAMPLE_LIB_BUILD_NUMBER 3 /*!< Development Build: Number of commits since baseline */
+#define SAMPLE_LIB_BUILD_BASELINE "v1.2.0-rc1" /*!< Development Build: git tag that is the base for the current development */
 
 /* Version Macro Definitions */
 

diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt
@@ -92,7 +92,9 @@ foreach(SRCFILE ${LIB_SRC_FILES})
 
     # Add it to the set of tests to run as part of "make test"
     add_test(${TESTNAME} ${TESTNAME}-testrunner)
-    install(TARGETS ${TESTNAME}-testrunner DESTINATION ${TGTNAME}/${UT_INSTALL_SUBDIR})
+    foreach(TGT ${INSTALL_TARGET_LIST})
+        install(TARGETS ${TESTNAME}-testrunner DESTINATION ${TGT}/${UT_INSTALL_SUBDIR})
+    endforeach()
 
 endforeach()