spl-core 7.1.0__py3-none-any.whl → 7.2.0__py3-none-any.whl

spl_core/__init__.py

@@ -1 +1 @@
-__version__ = "7.1.0"
+__version__ = "7.2.0"

spl_core/common.cmake

@@ -505,30 +505,18 @@ function(_spl_coverage_create_overall_report)
     endif(_SPL_COVERAGE_CREATE_OVERALL_REPORT_IS_NECESSARY)
 endfunction(_spl_coverage_create_overall_report)
 
-macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
-    _spl_set_coverage_create_overall_report_is_necessary()
-
-    set(exe_name ${COMPONENT_NAME}_test)
-    set(PROD_PARTIAL_LINK prod_partial_${COMPONENT_NAME}.obj)
-    set(MOCK_SRC mockup_${COMPONENT_NAME}.cc)
-
-    add_executable(${exe_name}
-        ${TEST_SOURCES}
-        ${MOCK_SRC}
-    )
-
-    # Create the component library
-    add_library(${COMPONENT_NAME} OBJECT ${SOURCES})
+macro(_spl_set_test_compile_and_link_options compilerId compilerVersion)
+    if(NOT ${compilerId} STREQUAL "GNU")
+        message(FATAL_ERROR "Unsupported compiler: ${compilerId} ${compilerVersion}")
+    endif()
 
     # Define list of test specific compile options for all sources
     # -ggdb: Produce debugging information to be able to set breakpoints.
     # -save-temps: save temporary files like preprocessed ones for debugging purposes
     set(TEST_COMPILE_OPTIONS -ggdb -save-temps)
 
-    target_compile_options(${exe_name} PRIVATE ${TEST_COMPILE_OPTIONS})
-
     # Coverage data is only generated for the component's sources
-    target_compile_options(${COMPONENT_NAME} PRIVATE --coverage -fcondition-coverage ${TEST_COMPILE_OPTIONS})
+    set(COMPONENT_TEST_COMPILE_OPTIONS --coverage ${TEST_COMPILE_OPTIONS})
 
     # Define list of test specific compile options for all sources
     # SPLE_UNIT_TESTING: add possibility to configure the code for unit testing
@@ -542,14 +530,43 @@ macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
         static_scope_file=
     )
 
-    target_compile_definitions(${exe_name} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+    set(TEST_LINK_OPTIONS -ggdb --coverage)
 
-    target_compile_definitions(${COMPONENT_NAME} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+    if(${compilerVersion} VERSION_GREATER_EQUAL 14.2)
+        # -fcondition-coverage: generate coverage data for conditionals
+        list(APPEND COMPONENT_TEST_COMPILE_OPTIONS -fcondition-coverage)
+        list(APPEND TEST_LINK_OPTIONS -fcondition-coverage)
+        message(STATUS "Condition coverage is enabled.")
+    else()
+        message(STATUS "Condition coverage is not supported by this compiler version.")
+    endif()
+endmacro(_spl_set_test_compile_and_link_options)
 
-    target_link_options(${exe_name}
-        PRIVATE -ggdb --coverage -fcondition-coverage
+macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
+    _spl_set_coverage_create_overall_report_is_necessary()
+
+    set(exe_name ${COMPONENT_NAME}_test)
+    set(PROD_PARTIAL_LINK prod_partial_${COMPONENT_NAME}.obj)
+    set(MOCK_SRC mockup_${COMPONENT_NAME}.cc)
+
+    _spl_set_test_compile_and_link_options(${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION})
+
+    add_executable(${exe_name}
+        ${TEST_SOURCES}
+        ${MOCK_SRC}
     )
 
+    target_compile_options(${exe_name} PRIVATE ${TEST_COMPILE_OPTIONS})
+    target_compile_definitions(${exe_name} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+    target_link_options(${exe_name} PRIVATE ${TEST_LINK_OPTIONS})
+
+    # Create the component library for its productive sources
+    add_library(${COMPONENT_NAME} OBJECT ${SOURCES})
+
+    target_compile_options(${COMPONENT_NAME} PRIVATE ${COMPONENT_TEST_COMPILE_OPTIONS})
+
+    target_compile_definitions(${COMPONENT_NAME} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+
     add_custom_command(
         OUTPUT ${PROD_PARTIAL_LINK}
         COMMAND ${CMAKE_CXX_COMPILER} -r -nostdlib -o ${PROD_PARTIAL_LINK} $<TARGET_OBJECTS:${COMPONENT_NAME}>
@@ -626,7 +643,7 @@ macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
     )
 
     gtest_discover_tests(${exe_name})
-endmacro()
+endmacro(_spl_add_test_suite)
 
 macro(spl_add_conan_requires requirement)
     list(APPEND CONAN__REQUIRES ${requirement})
@@ -690,6 +707,7 @@ macro(_spl_set_ninja_wrapper_as_cmake_make)
     else()
         set(NINJA_WRAPPER ${CMAKE_SOURCE_DIR}/build/${VARIANT}/${BUILD_KIT}/ninja_wrapper.bat)
     endif()
+
     file(WRITE ${NINJA_WRAPPER}
         "@echo off
 @call %~dp0%/activate_run.bat

{spl_core-7.1.0.dist-info → spl_core-7.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spl-core
-Version: 7.1.0
+Version: 7.2.0
 Summary: Software Product Line Support for CMake
 License: MIT
 Author: Avengineers
@@ -18,7 +18,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: cookiecutter (==2.1.1)
 Requires-Dist: doxysphinx (>=3.3,<4.0)
 Requires-Dist: gcovr (>=8.3,<9.0)
-Requires-Dist: hammocking (>=0.4.1,<0.5.0)
+Requires-Dist: hammocking (>=0.5,<0.6)
 Requires-Dist: kconfiglib (>=14.1,<15.0)
 Requires-Dist: mlx-traceability (>=10.0,<11.0)
 Requires-Dist: myst-parser (>=0.16)

{spl_core-7.1.0.dist-info → spl_core-7.2.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-spl_core/__init__.py,sha256=vrQk6cOG_uk0gOqN4qh7NRCxezXfvhv9tT7bwYHyTck,22
+spl_core/__init__.py,sha256=LltgKarREAvEui2nrEP4Zpe6CPFpqvS_Hp12Nz9Xgi4,22
 spl_core/__run.py,sha256=DphnN7_Bjiw_mOOztsHxTDHS8snz1g2MMWAaJpZxPKM,361
 spl_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/common/command_line_executor.py,sha256=GHIMpNiMD_eP44vq7L_HiC08aKt7lgW_wn_omU6REwQ,2217
 spl_core/common/path.py,sha256=sDujd3n4XP1XGjHc7ImXEdjihO6A8BOIDbKCf7HgQ0Y,462
-spl_core/common.cmake,sha256=ZVGny3AdQaJxTh9GFuRV6eR79wzNPVw5CHFV9uAY0EU,32734
+spl_core/common.cmake,sha256=6Ug5U2sbkoFwurfETARq6vFFmiJw3IHithJHbxJvfWQ,33638
 spl_core/conan.cmake,sha256=i1AuyN-e8cczX7TI1nl6e3Y8N-EP-QXPVY7LG6NUyJY,41958
 spl_core/config/KConfig,sha256=atlUwl0kPIdoGjbOI2PoaCQ2wgao7-mblZKn3dXUCxI,1755
 spl_core/gcov_maid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,8 +60,8 @@ spl_core/main.py,sha256=_hL4j155WZMXog_755bgAH1PeUwvTdJZvVdVw9EWhvo,1225
 spl_core/spl.cmake,sha256=42gb79k9nNklSdlx9F-yr-DDkGGxB56FnAnX35thvco,4541
 spl_core/test_utils/base_variant_test_runner.py,sha256=E5EtAX5qTLQbofIZ9eZoCx2SNd1CTm1HtEKqEn014fA,3493
 spl_core/test_utils/spl_build.py,sha256=OO7rIZpBb7EP87D39NeTK4XH17x3xNfwRI5YHPBvGgY,6041
-spl_core-7.1.0.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
-spl_core-7.1.0.dist-info/METADATA,sha256=LPWI5Z_zUkSgeqPPbUCWp8am-IeXg4pcCdlCuLP2C04,5160
-spl_core-7.1.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-spl_core-7.1.0.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
-spl_core-7.1.0.dist-info/RECORD,,
+spl_core-7.2.0.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
+spl_core-7.2.0.dist-info/METADATA,sha256=5O6xH4a0rUiJU2TY-B51wRqozSQEB6-Mr__tDxfuq-U,5156
+spl_core-7.2.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+spl_core-7.2.0.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
+spl_core-7.2.0.dist-info/RECORD,,