From 0a0a4c07268fff324321d27bc3129486e96c07a3 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 11 Sep 2020 13:02:24 -0400 Subject: [PATCH 1/2] Fix #30, Install unit test to target directory --- unit-test/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt index cc53e2e..91b720b 100644 --- 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() From 01680738e48db19243b39cc4a0cddf0ad4cef035 Mon Sep 17 00:00:00 2001 From: Yasir Khan Date: Mon, 21 Sep 2020 15:55:33 -0400 Subject: [PATCH 2/2] Increase version to v1.2.0-rc1+dev3, update readme. NOTE: BASELINE changed to v1.2.0-rc1 --- README.md | 5 +++++ fsw/src/sample_lib_version.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a1e0c9..1839b08 100644 --- 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 + ### 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 index e0775cf..d9468f6 100644 --- 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 */