Merge pull request #22 from nasa/integration-candidate

Integration Candidate: 2020-04-22

Author: astrogeco

README.md

@@ -6,18 +6,30 @@ This sample library is a non-flight example library implementation for the cFS B
 
 sample_lib implements SAMPLE_Function, as an example for how to build and link a library in cFS.
 
-## Version Notes
-
-- 1.1.2: DEVELOPMENT
-  - Added coverage test and a stub library to facilitate unit test
-  - Minor updates (see https://github.com/nasa/sample_lib/pull/16)
-- 1.1.1: DEVELOPMENT
-  - Minor updates (see https://github.com/nasa/sample_lib/pull/14)
-- **1.1.0 OFFICIAL RELEASE**:
-  - Minor updates (see https://github.com/nasa/sample_lib/pull/6)
-  - Released as part of cFE 6.7.0, Apache 2.0
-- **1.0.0a OFFICIAL RELEASE**:
-  - Released as part of cFE 6.6.0a, Apache 2.0
+## Version History
+
+#### Development Build: 1.1.3
+
+- Coverage data `make lcov` includes the sample_lib code
+- See https://github.com/nasa/sample_lib/pull/22 for more details
+ 
+#### Development Build: 1.1.2
+
+- Added coverage test and a stub library to facilitate unit test
+- Minor updates (see https://github.com/nasa/sample_lib/pull/16)
+
+#### Development Build: 1.1.1
+
+- Minor updates (see https://github.com/nasa/sample_lib/pull/14)
+
+### ***OFFICIAL RELEASE: 1.1.0***
+
+- Minor updates (see https://github.com/nasa/sample_lib/pull/6)
+- Released as part of cFE 6.7.0, Apache 2.0
+
+### ***OFFICIAL RELEASE: 1.0.0a***
+
+- Released as part of cFE 6.6.0a, Apache 2.0
 
 ## Known issues
 

fsw/src/sample_lib_version.h

@@ -32,7 +32,7 @@
 
 #define SAMPLE_LIB_MAJOR_VERSION    1
 #define SAMPLE_LIB_MINOR_VERSION    1
-#define SAMPLE_LIB_REVISION         2
+#define SAMPLE_LIB_REVISION         3
 #define SAMPLE_LIB_MISSION_REV      0
 
 

unit-test/CMakeLists.txt

@@ -62,10 +62,9 @@ foreach(SRCFILE ${LIB_SRC_FILES})
         ${UNIT_SOURCE_FILE}
     )    
 
-    # Apply the UT_C_FLAGS to the units under test
+    # Apply the UT_COVERAGE_COMPILE_FLAGS to the units under test
     # This should enable coverage analysis on platforms that support this
-    set_target_properties(ut_${TESTNAME}_object PROPERTIES
-        COMPILE_FLAGS "${UT_C_FLAGS}")
+    target_compile_options(ut_${TESTNAME}_object PRIVATE ${UT_COVERAGE_COMPILE_FLAGS})
 
     # For this object target only, the "override" includes should be injected
     # into the include path BEFORE any other include path.  This is so the
@@ -80,13 +79,11 @@ foreach(SRCFILE ${LIB_SRC_FILES})
         $<TARGET_OBJECTS:ut_${TESTNAME}_object>
     )
 
-    # This also needs to be linked with UT_C_FLAGS (for coverage)
-    set_target_properties(${TESTNAME}-testrunner PROPERTIES 
-        LINK_FLAGS "${UT_C_FLAGS}")
-    
+    # This also needs to be linked with UT_COVERAGE_LINK_FLAGS (for coverage)
     # This is also linked with any other stub libraries needed,
     # as well as the UT assert framework    
     target_link_libraries(${TESTNAME}-testrunner
+        ${UT_COVERAGE_LINK_FLAGS}
         ut_${UT_NAME}_stubs
         ut_${UT_NAME}_overrides
         ut_cfe-core_stubs