DTNN-653 Fixed functional test cmake

DTNN-653 Added include dirs to functional test

DTNN-653 Added link libs to functional test

DTNN-653 Functional test compilation mods

DTNN-653 Added bplib stubs to functional test

DTNN-653 Fixed stubs name

DTNN-653 Removed public from link_libraries

DTNN-653 Removed bplib stubs

DTNN-653 Added back bplib stubs

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix 2

DTNN-653 Functional test cmake fix 3

DTNN-653 Functional test cmake fix 4

DTNN-653 Functional test cmake fix 5

DTNN-653 Functional test cmake fix 6

DTNN-653 Functional test cmake fix 7

DTNN-653 Functional test cmake fix 8

DTNN-653 Functional test cmake fix 9

DTNN-653 Functional test cmake fix 9

DTNN-653 Functional test cmake fix 9

DTNN-653 Functional test cmake fix 9

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix

DTNN-653 Functional test cmake fix

Author: sara-gb

CMakeLists.txt

@@ -120,13 +120,6 @@ foreach(COMPONENT ${BPLIB_COMPONENTS})
 
 endforeach()
 
-# Link all stubs into single library
-add_library(coverage-bplib-stubs INTERFACE)
-
-foreach(COMPONENT ${BPLIB_COMPONENTS})
-  target_link_libraries(coverage-bplib-stubs INTERFACE ${COMPONENT}_stubs)
-endforeach()
-
 # If building as part of CFE/CFS, then the "IS_CFS_ARCH_BUILD" should be set
 # this allows simply dropping this module into a CFS project
 if (IS_CFS_ARCH_BUILD)
@@ -193,18 +186,18 @@ endif()
 
 get_target_property(IS_PIC bplib POSITION_INDEPENDENT_CODE)
 if (IS_PIC)
-  foreach(COMPONENT ${BPLIB_COMPONENTS})
-    set_target_properties(${COMPONENT} PROPERTIES POSITION_INDEPENDENT_CODE ${IS_PIC})
-  endforeach()
+  set_target_properties(${BPLIB_COMPONENTS} PROPERTIES POSITION_INDEPENDENT_CODE ${IS_PIC})
 endif()
 
 # Set the standard compile options for all submodules (c99, full warnings)
-list(APPEND ${BPLIB_COMPONENTS} bplib)
 foreach(COMPONENT ${BPLIB_COMPONENTS})
   target_compile_features(${COMPONENT} PRIVATE c_std_99)
   target_compile_options(${COMPONENT} PRIVATE ${BPLIB_COMMON_COMPILE_OPTIONS})
 endforeach()
 
+target_compile_features(bplib PRIVATE c_std_99)
+target_compile_options(bplib PRIVATE ${BPLIB_COMMON_COMPILE_OPTIONS})
+
 # Internal/private header files exist within the implementation directories
 target_include_directories(bplib PRIVATE ${BPLIB_PRIVATE_INCLUDE_DIRS})
 
@@ -218,6 +211,17 @@ target_include_directories(bplib PUBLIC
 
 # BPLib Sanity checks are only for standalone builds, sanity checks
 # for CFE/CFS builds should be part of the BP app, as opposed to BPLib
-if (BPLIB_ENABLE_UNIT_TESTS AND NOT IS_CFS_ARCH_BUILD)
-  add_subdirectory(ut-functional)
-endif ()
+if (BPLIB_ENABLE_UNIT_TESTS)
+
+  # Link all stubs into single library
+  add_library(coverage-bplib-stubs INTERFACE)
+
+  foreach(COMPONENT ${BPLIB_COMPONENTS})
+    target_link_libraries(coverage-bplib-stubs INTERFACE ${COMPONENT}_stubs)
+  endforeach()
+
+  if (NOT IS_CFS_ARCH_BUILD)
+    add_subdirectory(ut-functional)
+  endif (NOT IS_CFS_ARCH_BUILD)
+  
+endif (BPLIB_ENABLE_UNIT_TESTS)

ut-functional/CMakeLists.txt

@@ -1,12 +1,14 @@
 ##################################################################
 #
-# coverage test build recipe
+# Coverage test build recipe
 #
 # This CMake file contains the recipe for building the coverage tests.
 # It is invoked from the parent directory when unit tests are enabled.
 #
 ##################################################################
 
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 # Add executable
 add_executable(functional-bplib_sanity-testrunner
     sanity-test.c
@@ -15,6 +17,10 @@ add_executable(functional-bplib_sanity-testrunner
 target_compile_features(functional-bplib_sanity-testrunner PUBLIC c_std_99)
 target_compile_options(functional-bplib_sanity-testrunner PUBLIC ${BPLIB_COMMON_COMPILE_OPTIONS})
 
+target_include_directories(functional-bplib_sanity-testrunner PUBLIC
+    $<TARGET_PROPERTY:bplib,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
 target_link_libraries(functional-bplib_sanity-testrunner PUBLIC
     bplib
     ut_assert
@@ -28,4 +34,4 @@ if (INSTALL_TARGET_LIST)
     foreach(TGT ${INSTALL_TARGET_LIST})
         install(TARGETS functional-bplib_sanity-testrunner DESTINATION ${TGT}/${UT_INSTALL_SUBDIR})
     endforeach()
-endif()
+endif()