spl-core 7.2.6__tar.gz → 7.3.0rc1__tar.gz

{spl_core-7.2.6 → spl_core-7.3.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spl-core
-Version: 7.2.6
+Version: 7.3.0rc1
 Summary: Software Product Line Support for CMake
 License: MIT
 Author: Avengineers

{spl_core-7.2.6 → spl_core-7.3.0rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spl-core"
-version = "7.2.6"
+version = "7.3.0-rc.1"
 description = "Software Product Line Support for CMake"
 authors = ["Avengineers <karsten.guenther@kamg.de>"]
 license = "MIT"

spl_core-7.3.0rc1/src/spl_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.3.0-rc.1"

{spl_core-7.2.6 → spl_core-7.3.0rc1}/src/spl_core/common.cmake

@@ -183,9 +183,9 @@ macro(spl_create_component)
 \"reports_output_dir\": \"\"
 }")
 
-    list(APPEND target_include_directories__INCLUDES ${CMAKE_CURRENT_LIST_DIR}/src)
-    list(APPEND target_include_directories__INCLUDES ${CMAKE_CURRENT_BINARY_DIR})
-
+    # handle include directories with global variable
+    #list(APPEND target_include_directories__INCLUDES ${CMAKE_CURRENT_LIST_DIR}/src)
+    #list(APPEND target_include_directories__INCLUDES ${CMAKE_CURRENT_BINARY_DIR})
     list(APPEND target_include_directories__INCLUDES ${INCLUDES})
     list(REMOVE_DUPLICATES target_include_directories__INCLUDES)
     set(target_include_directories__INCLUDES ${target_include_directories__INCLUDES} PARENT_SCOPE)
@@ -355,6 +355,10 @@ Code Coverage
         endif(EXISTS ${_component_doc_file})
     endif(BUILD_KIT STREQUAL prod)
 
+    # handle include directories with spl_macros
+    spl_add_provided_interfaces("${CMAKE_CURRENT_LIST_DIR}/src")
+    spl_add_provided_interfaces("${CMAKE_CURRENT_BINARY_DIR}")
+
     # Collect all component info for later usage (e.g., in an extension)
     list(APPEND COMPONENTS_INFO ${_component_info})
     set(COMPONENTS_INFO ${COMPONENTS_INFO} PARENT_SCOPE)
@@ -740,3 +744,71 @@ macro(_spl_create_build_info_file)
     ]
 }")
 endmacro()
+
+macro(spl_add_provided_interfaces list_of_directories)
+    # Collect all provided interfaces for later usage (e.g., in an extension)
+    if(TARGET ${component_name})
+        get_target_property(provided_interfaces ${component_name} PROVIDED_INTERFACES)
+        if(provided_interfaces STREQUAL "provided_interfaces-NOTFOUND")
+            set_target_properties(${component_name} PROPERTIES PROVIDED_INTERFACES "${list_of_directories}")
+        else()
+            list(APPEND provided_interfaces ${list_of_directories})
+            set_target_properties(${component_name} PROPERTIES PROVIDED_INTERFACES "${provided_interfaces}")
+        endif()
+    endif()
+    list(APPEND target_include_directories__INCLUDES ${list_of_directories})
+    list(REMOVE_DUPLICATES target_include_directories__INCLUDES)
+    set(target_include_directories__INCLUDES ${target_include_directories__INCLUDES} PARENT_SCOPE)
+endmacro()
+
+macro(spl_add_required_interfaces list_of_interfaces)
+    if(TARGET ${component_name})
+        get_target_property(required_interfaces ${component_name} REQUIRED_INTERFACES)
+        if(required_interfaces STREQUAL "required_interfaces-NOTFOUND")
+            set_target_properties(${component_name} PROPERTIES REQUIRED_INTERFACES "${list_of_interfaces}")
+        else()
+            list(APPEND required_interfaces ${list_of_interfaces})
+            set_target_properties(${component_name} PROPERTIES REQUIRED_INTERFACES "${required_interfaces}")
+        endif()
+    endif()
+endmacro()
+
+macro(spl_resolve_interfaces)
+    foreach(component_name ${COMPONENT_NAMES})
+        if(TARGET ${component_name})
+            # get provided interfaces
+            get_target_property(COMP_PROVIDED_INTERFACES ${component_name} PROVIDED_INTERFACES)
+            if(NOT COMP_PROVIDED_INTERFACES STREQUAL "COMP_PROVIDED_INTERFACES-NOTFOUND")
+                target_include_directories(${component_name} PUBLIC ${COMP_PROVIDED_INTERFACES})
+            endif()
+
+            # get required interfaces
+            set(COMP_REQUIRED_INTERFACES "")
+            get_target_property(REQUIRED_INTERFACES ${component_name} REQUIRED_INTERFACES)
+            if(NOT REQUIRED_INTERFACES STREQUAL "REQUIRED_INTERFACES-NOTFOUND")
+                foreach(interface ${REQUIRED_INTERFACES})
+                    if (TARGET ${interface})
+                        # if the interface is a target, we can get the provided interfaces
+                        get_target_property(IF_PROVIDED_INTERFACES ${interface} PROVIDED_INTERFACES)
+                        list(APPEND COMP_REQUIRED_INTERFACES ${IF_PROVIDED_INTERFACES})
+                    else()
+                        # if the interface is not a target, we assume it is a path to an include directory
+                        _spl_get_absolute_path(absolute_interface ${interface})
+                        if(EXISTS "${absolute_interface}" AND IS_DIRECTORY "${absolute_interface}")
+                            list(APPEND COMP_REQUIRED_INTERFACES ${absolute_interface})
+                            # support the old way of handling includes
+                            list(APPEND target_include_directories__INCLUDES ${absolute_interface})
+                        else()
+                            message(WARNING "Required interface ${interface} not found for component ${component_name}.")
+                        endif()
+                    endif()
+                endforeach()
+                list(REMOVE_DUPLICATES target_include_directories__INCLUDES)
+            else()
+                set(COMP_REQUIRED_INTERFACES ${target_include_directories__INCLUDES})
+            endif()
+            # add the include directories to the component
+            target_include_directories(${component_name} PUBLIC ${COMP_REQUIRED_INTERFACES})
+        endif()
+    endforeach()
+endmacro()

spl_core-7.2.6/src/spl_core/__init__.py

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