spl-core 7.1.0__tar.gz → 7.2.0__tar.gz

{spl_core-7.1.0 → spl_core-7.2.0}/PKG-INFO

@@ -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 → spl_core-7.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spl-core"
-version = "7.1.0"
+version = "7.2.0"
 description = "Software Product Line Support for CMake"
 authors = ["Avengineers <karsten.guenther@kamg.de>"]
 license = "MIT"
@@ -28,7 +28,7 @@ python = ">=3.10,<3.12"
 py-app-dev = "^2.1"
 cookiecutter = "==2.1.1"
 gcovr = "^8.3"
-hammocking = "^0.4.1"
+hammocking = "^0.5"
 kconfiglib = "^14.1"
 typer = "^0"
 doxysphinx = "^3.3"
@@ -52,7 +52,7 @@ pytest = "^7.0"
 pytest-cov = "^4.0"
 black = "^23.1.0"
 pre-commit = "^3.1.1"
-ruff = "^0.3.0"
+ruff = "^0.5"
 jinja2 = "*"
 testfixtures = "*"
 junitparser = "*"

spl_core-7.2.0/src/spl_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.2.0"

{spl_core-7.1.0 → spl_core-7.2.0}/src/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/src/spl_core/__init__.py

@@ -1 +0,0 @@
-__version__ = "7.1.0"