new CMakeConfigDeps properties to inject extra dependencies and targets (#18316)

Author: memsharded

conan/tools/cmake/cmakedeps2/target_configuration.py

@@ -190,6 +190,8 @@ def _get_cmake_lib(self, info, components, pkg_folder, pkg_folder_var):
         # FIXME: Filter by lib traits!!!!!
         if not self._require.headers:  # If not depending on headers, paths and
             includedirs = defines = None
+        extra_libs = self._cmakedeps.get_property("cmake_extra_interface_libs", self._conanfile,
+                                                  check_type=list) or []
         sources = [self._path(source, pkg_folder, pkg_folder_var) for source in info.sources]
         target = {"type": "INTERFACE",
                   "includedirs": includedirs,
@@ -199,7 +201,7 @@ def _get_cmake_lib(self, info, components, pkg_folder, pkg_folder_var):
                   "cflags": " ".join(cmake_escape_value(f) for f in info.cflags),
                   "sharedlinkflags": " ".join(cmake_escape_value(v) for v in info.sharedlinkflags),
                   "exelinkflags": " ".join(cmake_escape_value(v) for v in info.exelinkflags),
-                  "system_libs": " ".join(info.system_libs),
+                  "system_libs": " ".join(info.system_libs + extra_libs),
                   "sources": " ".join(sources)
         }
         # System frameworks (only Apple OS)
@@ -295,6 +297,9 @@ def _get_dependencies(self):
         transitive_reqs = self._cmakedeps.get_transitive_requires(self._conanfile)
         # FIXME: Hardcoded CONFIG
         ret = {self._cmakedeps.get_cmake_filename(r): "CONFIG" for r in transitive_reqs.values()}
+        extra_mods = self._cmakedeps.get_property("cmake_extra_dependencies", self._conanfile,
+                                                  check_type=list) or []
+        ret.update({extra_mod: "" for extra_mod in extra_mods})
         return ret
 
     @staticmethod

test/integration/toolchains/cmake/cmakedeps2/test_cmakedeps.py

@@ -388,6 +388,27 @@ def package_info(self):
     assert "CMakeConfigDeps does not support module find mode"
 
 
+def test_cmake_extra_dependencies():
+    tc = TestClient()
+    dep = textwrap.dedent("""
+        from conan import ConanFile
+        class Pkg(ConanFile):
+            name = "dep"
+            version = "0.1"
+            def package_info(self):
+                self.cpp_info.set_property("cmake_extra_dependencies", ["MyOpenMPI"])
+                self.cpp_info.set_property("cmake_extra_interface_libs", ["MyOpenMPILib"])
+        """)
+    tc.save({"conanfile.py": dep})
+    tc.run("create .")
+    args = f"-g CMakeDeps -c tools.cmake.cmakedeps:new={new_value}"
+    tc.run(f"install --requires=dep/0.1 {args}")
+    dep = tc.load("dep-Targets-release.cmake")
+    assert "find_dependency(MyOpenMPI REQUIRED )" in dep
+    assert "set_property(TARGET dep::dep APPEND PROPERTY INTERFACE_LINK_LIBRARIES\n" \
+           "             $<$<CONFIG:RELEASE>:MyOpenMPILib>)" in dep
+
+
 class TestRequiresToApp:
     def test_requires_to_application(self):
         c = TestClient()