🎨 Split sc into a separate library

Author: elbeno

CMakeLists.txt

@@ -28,10 +28,34 @@ add_versioned_package("gh:intel/cpp-baremetal-concurrency#7c5b26c")
 add_versioned_package("gh:intel/cpp-std-extensions#2512bcf")
 add_versioned_package("gh:intel/cpp-baremetal-senders-and-receivers#73d95bc")
 
+add_library(cib_sc INTERFACE)
+target_compile_features(cib_sc INTERFACE cxx_std_20)
+target_link_libraries_system(cib_sc INTERFACE fmt::fmt-header-only stdx)
+
+target_sources(
+    cib_sc
+    INTERFACE FILE_SET
+              sc
+              TYPE
+              HEADERS
+              BASE_DIRS
+              include
+              FILES
+              include/sc/format.hpp
+              include/sc/fwd.hpp
+              include/sc/lazy_string_format.hpp
+              include/sc/string_constant.hpp)
+
 add_library(cib INTERFACE)
 target_compile_features(cib INTERFACE cxx_std_20)
-target_link_libraries_system(cib INTERFACE async concurrency
-                             fmt::fmt-header-only stdx)
+target_link_libraries_system(
+    cib
+    INTERFACE
+    async
+    cib_sc
+    concurrency
+    fmt::fmt-header-only
+    stdx)
 
 target_sources(
     cib
@@ -179,20 +203,6 @@ target_sources(
               include/msg/send.hpp
               include/msg/service.hpp)
 
-target_sources(
-    cib
-    INTERFACE FILE_SET
-              sc
-              TYPE
-              HEADERS
-              BASE_DIRS
-              include
-              FILES
-              include/sc/format.hpp
-              include/sc/fwd.hpp
-              include/sc/lazy_string_format.hpp
-              include/sc/string_constant.hpp)
-
 target_sources(
     cib
     INTERFACE FILE_SET

test/CMakeLists.txt

@@ -1,6 +1,9 @@
 function(add_tests)
+    set(multiValueArgs FILES LIBRARIES)
+    cmake_parse_arguments(AT "" "" "${multiValueArgs}" ${ARGN})
+
     get_filename_component(prefix ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-    foreach(name ${ARGN})
+    foreach(name ${AT_FILES})
         string(REPLACE "/" "_" test ${name})
         add_unit_test(
             "${prefix}_${test}_test"
@@ -9,7 +12,7 @@ function(add_tests)
             "${name}.cpp"
             LIBRARIES
             warnings
-            cib)
+            ${AT_LIBRARIES})
     endforeach()
 endfunction()
 

test/cib/CMakeLists.txt

@@ -1 +1,8 @@
-add_tests(builder_meta callback nexus readme_hello_world)
+add_tests(
+    FILES
+    builder_meta
+    callback
+    nexus
+    readme_hello_world
+    LIBRARIES
+    cib)

test/flow/CMakeLists.txt

@@ -8,6 +8,15 @@ add_unit_test(
     warnings
     cib)
 
-add_tests(flow graph graph_builder logging log_levels custom_log_levels)
+add_tests(
+    FILES
+    flow
+    graph
+    graph_builder
+    logging
+    log_levels
+    custom_log_levels
+    LIBRARIES
+    cib)
 
 add_subdirectory(fail)

test/interrupt/CMakeLists.txt

@@ -1,8 +1,11 @@
 add_tests(
+    FILES
     dynamic_controller
     irq_impl
     manager
     shared_irq_impl
     shared_sub_irq_impl
     sub_irq_impl
-    policies)
+    policies
+    LIBRARIES
+    cib)

test/log/CMakeLists.txt

@@ -1,4 +1,12 @@
-add_tests(fmt_logger log mipi_encoder mipi_logger module_id)
+add_tests(
+    FILES
+    fmt_logger
+    log
+    mipi_encoder
+    mipi_logger
+    module_id
+    LIBRARIES
+    cib)
 
 add_library(catalog1_lib STATIC catalog1_lib.cpp)
 add_library(catalog2_lib OBJECT catalog2a_lib.cpp catalog2b_lib.cpp)

test/lookup/CMakeLists.txt

@@ -1,4 +1,11 @@
-add_tests(input linear_search pseudo_pext_lookup lookup)
+add_tests(
+    FILES
+    input
+    linear_search
+    pseudo_pext_lookup
+    lookup
+    LIBRARIES
+    cib)
 
 add_versioned_package("gh:boost-ext/mph#v1.0.8")
 add_versioned_package("gh:serge-sans-paille/frozen#292a811")

test/match/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_tests(
+    FILES
     and
     constant
     equivalence
@@ -10,4 +11,6 @@ add_tests(
     simplify_custom
     simplify_not
     simplify_or
-    sum_of_products)
+    sum_of_products
+    LIBRARIES
+    cib)

test/msg/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_tests(
+    FILES
     callback
     field_extract
     field_insert
@@ -9,7 +10,9 @@ add_tests(
     indexed_callback
     indexed_handler
     message
-    send)
+    send
+    LIBRARIES
+    cib)
 
 add_subdirectory(fail)
 

test/sc/CMakeLists.txt

@@ -1 +1 @@
-add_tests(format string_constant)
+add_tests(FILES format string_constant LIBRARIES cib_sc)