cpp_info components

conans/client/generators/cmake_multi.py

@@ -4,7 +4,7 @@
                                                    cmake_package_info, cmake_user_info_vars,
                                                    generate_targets_section)
 from conans.model import Generator
-from conans.model.build_info import CppInfo
+from conans.model.build_info import CppInfo, DepCppInfo, DepsCppInfo
 
 
 def extend(cpp_info, config):
@@ -26,7 +26,7 @@ def add_lists(seq1, seq2):
         result.cxxflags = cpp_info.cxxflags + config_info.cxxflags
         result.sharedlinkflags = cpp_info.sharedlinkflags + config_info.sharedlinkflags
         result.exelinkflags = cpp_info.exelinkflags + config_info.exelinkflags
-        return result
+        return DepCppInfo(result)
     return cpp_info
 
 
@@ -45,23 +45,26 @@ def filename(self):
 
     def _content_type(self, build_type):
         sections = []
+        global_deps_cpp_info = DepsCppInfo()
 
         # Per requirement variables
         for dep_name, dep_cpp_info in self.deps_build_info.dependencies:
+
             # Only the specific of the build_type
             dep_cpp_info = extend(dep_cpp_info, build_type)
             deps = DepsCppCmake(dep_cpp_info)
             dep_flags = cmake_dependency_vars(dep_name, deps=deps, build_type=build_type)
             sections.append(dep_flags)
+            # Store the extended DepCppInfos for global variables
+            global_deps_cpp_info.update_dep_cpp_info(dep_cpp_info, dep_name)
 
         # GENERAL VARIABLES
         sections.append("\n### Definition of global aggregated variables ###\n")
         all_flags = cmake_dependencies(dependencies=self.deps_build_info.deps,
                                        build_type=build_type)
         sections.append(all_flags)
 
-        dep_cpp_info = extend(self.deps_build_info, build_type)
-        deps = DepsCppCmake(dep_cpp_info)
+        deps = DepsCppCmake(global_deps_cpp_info)
         all_flags = cmake_global_vars(deps=deps, build_type=build_type)
         sections.append(all_flags)
 

conans/client/generators/json_generator.py

@@ -44,11 +44,7 @@ def get_deps_user_info(self):
     def get_dependencies_info(self):
         res = []
         for depname, cpp_info in self.deps_build_info.dependencies:
-            serialized_info = serialize_cpp_info(cpp_info)
-            serialized_info["name"] = depname
-            for cfg, cfg_cpp_info in cpp_info.configs.items():
-                serialized_info.setdefault("configs", {})[cfg] = serialize_cpp_info(cfg_cpp_info)
-            res.append(serialized_info)
+            res.append(cpp_info.as_dict())
         return res
 
     def get_settings(self):

conans/client/generators/text.py

@@ -1,6 +1,7 @@
+import os
 import re
 import traceback
-from collections import defaultdict
+from collections import OrderedDict, defaultdict
 
 from conans.errors import ConanException
 from conans.model import Generator
@@ -11,6 +12,13 @@
 from conans.util.log import logger
 
 
+class OrderedDefaultDict(OrderedDict):
+
+    def __missing__(self, key):
+        self[key] = value = defaultdict(dict)
+        return value
+
+
 class DepsCppTXT(object):
     def __init__(self, cpp_info):
         self.include_paths = "\n".join(p.replace("\\", "/")
@@ -87,7 +95,7 @@ def _loads_cpp_info(text):
 
         try:
             # Parse the text
-            data = defaultdict(lambda: defaultdict(dict))
+            data = OrderedDefaultDict()
             for m in pattern.finditer(text):
                 var_name = m.group(1)
                 lines = []
@@ -115,17 +123,39 @@ def _loads_cpp_info(text):
             deps_cpp_info = DepsCppInfo()
             for dep, configs_cpp_info in data.items():
                 if dep is None:
-                    cpp_info = deps_cpp_info
+                    # None corresponds to the aggregated values from all the dependencies. It is
+                    # skipped because we are assigning the dependencies individually and can compose
+                    # the aggregated values
+                    continue
                 else:
-                    cpp_info = deps_cpp_info._dependencies.setdefault(dep, CppInfo(root_folder=""))
+                    root_path = configs_cpp_info[None]["rootpath"][0]  # Get general rootpath
+                    cpp_info = CppInfo(root_path)
+                    cpp_info.filter_empty = False
 
                 for config, fields in configs_cpp_info.items():
                     item_to_apply = cpp_info if not config else getattr(cpp_info, config)
 
                     for key, value in fields.items():
-                        if key in ['rootpath', 'sysroot']:
+                        if key == 'rootpath':
+                            continue
+                        if key == 'sysroot':
                             value = value[0]
+                        if key in ["includedirs", "libdirs", "bindirs", "builddirs", "srcdirs",
+                                   "resdirs"]:
+                            # Convert absolute paths to relative if root_path is inside the path
+                            saved_values = value
+                            value = []
+                            for val in saved_values:
+                                try:
+                                    rel_path = os.path.relpath(val, root_path)
+                                    if ".." in rel_path:
+                                        value.append(val)
+                                    else:
+                                        value.append(rel_path)
+                                except ValueError:
+                                    value.append(val)
                         setattr(item_to_apply, key, value)
+                deps_cpp_info.update(cpp_info, dep)
             return deps_cpp_info
 
         except Exception as e:

conans/client/installer.py

@@ -464,6 +464,7 @@ def _propagate_info(node):
 
     def _call_package_info(self, conanfile, package_folder, ref):
         conanfile.cpp_info = CppInfo(package_folder)
+        conanfile.cpp_info.name = conanfile.name
         conanfile.cpp_info.version = conanfile.version
         conanfile.cpp_info.description = conanfile.description
         conanfile.env_info = EnvInfo()

conans/client/recorder/action_recorder.py

@@ -22,23 +22,6 @@
 INSTALL_ERROR_BUILDING = "building"
 
 
-def _cpp_info_to_dict(cpp_info):
-    doc = {}
-    for it, value in vars(cpp_info).items():
-        if it.startswith("_") or not value:
-            continue
-
-        if it == "configs":
-            configs_data = {}
-            for cfg_name, cfg_cpp_info in value.items():
-                configs_data[cfg_name] = _cpp_info_to_dict(cfg_cpp_info)
-            doc["configs"] = configs_data
-            continue
-
-        doc[it] = value
-    return doc
-
-
 class Action(namedtuple("Action", "type, full_ref, doc, time")):
 
     def __new__(cls, the_type, full_ref, doc=None):
@@ -112,7 +95,7 @@ def package_install_error(self, pref, error_type, description, remote_name=None)
     def package_cpp_info(self, pref, cpp_info):
         assert isinstance(pref, PackageReference)
         # assert isinstance(cpp_info, CppInfo)
-        self._inst_packages_info[pref.copy_clear_revs()]['cpp_info'] = _cpp_info_to_dict(cpp_info)
+        self._inst_packages_info[pref.copy_clear_revs()]['cpp_info'] = cpp_info.as_dict()
 
     @property
     def install_errored(self):