Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conan/tools/cmake/cmakedeps2/target_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ def _get_libs(self, cpp_info, pkg_name, pkg_folder, pkg_folder_var) -> dict:
return libs

def _get_cmake_lib(self, info, components, pkg_folder, pkg_folder_var, comp_name=None):
if info.exe or not (info.package_framework or info.includedirs or info.libs
or info.system_libs):
if info.exe or not (info.package_framework or info.frameworks or info.includedirs or info.libs
or info.system_libs or info.defines):
return

includedirs = ";".join(self._path(i, pkg_folder, pkg_folder_var)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,27 @@ def requirements(self):
})
client.run(f"create . -c tools.cmake.cmakedeps:new={new_value}", assert_error=True)
assert "Error in generator 'CMakeConfigDeps': cpp_info.location missing for framework MyFramework" in client.out


def test_framework_only_component_generates_target():
conanfile = textwrap.dedent(f"""
import os
from conan import ConanFile

class MyFramework(ConanFile):
name = "frame"
version = "1.0"
settings = "os", "arch", "compiler", "build_type"

def package_info(self):
self.cpp_info.frameworks = ["MyFramework"]
self.cpp_info.libdirs = []
self.cpp_info.includedirs = []
""")

tc = TestClient()
tc.save({"conanfile.py": conanfile})
tc.run("create .")
tc.run(f"install --requires=frame/1.0 -g CMakeConfigDeps -c=tools.cmake.cmakedeps:new={new_value}")
targets = tc.load("frame-Targets-release.cmake")
assert "add_library(frame::frame INTERFACE IMPORTED)" in targets
24 changes: 24 additions & 0 deletions test/integration/toolchains/cmake/cmakedeps2/test_cmakedeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -640,3 +640,27 @@ def package_info(self):
assert 'set(CMAKE_GENERATOR_INSTANCE "${GENERATOR_INSTANCE}/buildTools/")' in target
assert 'set(FOO 42)' in target
assert 'set(CACHE_VAR_DEFAULT_DOC "hello world" CACHE PATH "CACHE_VAR_DEFAULT_DOC")' in target


def test_target_defines_only():
client = TestClient()
conanfile = textwrap.dedent("""
from conan import ConanFile

class Pkg(ConanFile):
name = "pkg"
version = "0.1"

def package_info(self):
self.cpp_info.components["base"].includedirs = []
self.cpp_info.components["base"].defines = ["FOO=1"]
self.cpp_info.components["comp"].includedirs = ["include"]
self.cpp_info.components["comp"].requires = ["base"]
""")
client.save({"conanfile.py": conanfile})
client.run("create .")

client.run(f"install --requires=pkg/0.1 -g CMakeDeps -c tools.cmake.cmakedeps:new={new_value}")
target = client.load("pkg-Targets-release.cmake")
assert 'add_library(pkg::base INTERFACE IMPORTED)' in target
assert "# Requirement pkg::base => Full link: True" in target
Loading