DTNN-635 Fixed unit test cmakes, simplified top-level cmake with list of components

Author: sara-gb

CMakeLists.txt

@@ -88,18 +88,28 @@ endif()
 add_subdirectory(cla)
 add_subdirectory(aa/as)
 
-
-# v7 implementation parts
-list(APPEND BPLIB_SRC
-  $<TARGET_OBJECTS:bplib_cla>
-  $<TARGET_OBJECTS:bplib_as>
+list(APPEND BPLIB_COMPONENTS
+  bplib_cla
+  bplib_as
 )
 
-list(APPEND BPLIB_PRIVATE_INCLUDE_DIRS
-  $<TARGET_PROPERTY:bplib_cla,INTERFACE_INCLUDE_DIRECTORIES>
-  $<TARGET_PROPERTY:bplib_as,INTERFACE_INCLUDE_DIRECTORIES>
+foreach(COMPONENT ${BPLIB_COMPONENTS})
+  list(APPEND BPLIB_SRC 
+    $<TARGET_OBJECTS:${COMPONENT}>
+  )
+  
+  list(APPEND BPLIB_PRIVATE_INCLUDE_DIRS
+    $<TARGET_PROPERTY:${COMPONENT},INTERFACE_INCLUDE_DIRECTORIES>
+  )
 
-)
+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
@@ -167,16 +177,16 @@ endif()
 
 get_target_property(IS_PIC bplib POSITION_INDEPENDENT_CODE)
 if (IS_PIC)
-  set_target_properties(
-    bplib_cla bplib_as
-    PROPERTIES POSITION_INDEPENDENT_CODE ${IS_PIC}
-  )
+  foreach(COMPONENT ${BPLIB_COMPONENTS})
+    set_target_properties(${COMPONENT} PROPERTIES POSITION_INDEPENDENT_CODE ${IS_PIC})
+  endforeach()
 endif()
 
 # Set the standard compile options for all submodules (c99, full warnings)
-foreach(TGT bplib bplib_cla bplib_as)
-  target_compile_features(${TGT} PRIVATE c_std_99)
-  target_compile_options(${TGT} PRIVATE ${BPLIB_COMMON_COMPILE_OPTIONS})
+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()
 
 # Internal/private header files exist within the implementation directories

aa/as/unit-test/CMakeLists.txt

@@ -1,12 +1,24 @@
 ##################################################################
 #
-# 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.
 #
 ##################################################################
 
+# Create stubs (for external use)
+add_library(bplib_as_stubs STATIC
+    stubs/bplib_as_stubs.c
+)
+
+target_include_directories(bplib_as_stubs PUBLIC
+    $<TARGET_PROPERTY:bplib_as,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
+target_link_libraries(bplib_as_stubs ut_assert ut_core_api_stubs)
+
+# Create unit test object
 add_library(utobj_bplib_as OBJECT
     ../src/bplib_as.c
 )
@@ -26,7 +38,7 @@ target_include_directories(utobj_bplib_as PRIVATE
     $<TARGET_PROPERTY:ut_coverage_compile,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
-# Add executable
+# Create test runner executable
 add_executable(coverage-bplib_as-testrunner
     utilities/bplib_as_test_utils.c
     bplib_as_test.c
@@ -35,8 +47,8 @@ add_executable(coverage-bplib_as-testrunner
 
 target_include_directories(coverage-bplib_as-testrunner PRIVATE
     ../src
-    ${CMAKE_CURRENT_SOURCE_DIR}/inc
     utilities/
+    ${CMAKE_CURRENT_SOURCE_DIR}/inc
     $<TARGET_PROPERTY:bplib_as,INTERFACE_INCLUDE_DIRECTORIES>
 )
 

aa/as/unit-test/stubs/CMakeLists.txt

@@ -1,12 +1,24 @@
 ##################################################################
 #
-# 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.
 #
 ##################################################################
 
+# Create stubs (for external use)
+add_library(bplib_cla_stubs STATIC
+    stubs/bplib_cla_stubs.c
+)
+
+target_include_directories(bplib_cla_stubs PUBLIC
+    $<TARGET_PROPERTY:bplib_cla,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
+target_link_libraries(bplib_cla_stubs ut_assert ut_core_api_stubs)
+
+# Create unit test object
 add_library(utobj_bplib_cla OBJECT
     ../src/bplib_cla.c
 )
@@ -26,7 +38,7 @@ target_include_directories(utobj_bplib_cla PRIVATE
     $<TARGET_PROPERTY:ut_coverage_compile,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
-# Add executable
+# Create test runner executable
 add_executable(coverage-bplib_cla-testrunner
     utilities/bplib_cla_test_utils.c
     bplib_cla_test.c