Skip to content

Commit

Permalink
fix PkgConfigDeps editable (#11440)
Browse files Browse the repository at this point in the history
  • Loading branch information
memsharded committed Jun 13, 2022
1 parent cc30ecc commit 27a4725
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion conan/tools/gnu/pkgconfigdeps/pc_files_templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def _get_formatted_dirs(folders, prefix_path_):


def get_pc_filename_and_content(conanfile, dep, name, requires, description, cpp_info=None):
package_folder = dep.package_folder
package_folder = dep.package_folder or "" # If editable, package_folder can be None
cpp_info = cpp_info or dep.cpp_info
version = cpp_info.get_property("component_version") or dep.ref.version

Expand Down
29 changes: 29 additions & 0 deletions conans/test/integration/toolchains/gnu/test_pkgconfigdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -627,3 +627,32 @@ def build_requirements(self):
client.run("install . -g PkgConfigDeps")
assert "Description: Conan package: test" in client.load("test.pc")
assert "Description: Conan package: app" in client.load("app.pc")


def test_with_editable_layout():
"""
https://github.com/conan-io/conan/issues/11435
"""
client = TestClient()
dep = textwrap.dedent("""
from conan import ConanFile
from conan.tools.files import save
class Dep(ConanFile):
name = "dep"
version = "0.1"
def layout(self):
self.cpp.source.includedirs = ["include"]
def package_info(self):
self.cpp_info.libs = ["mylib"]
""")
client.save({"dep/conanfile.py": dep,
"dep/include/header.h": "",
"pkg/conanfile.py": GenConanfile("pkg", "0.1").with_requires("dep/0.1")})
client.run("create dep")
client.run("editable add dep dep/0.1")
with client.chdir("pkg"):
client.run("install . -g PkgConfigDeps")
pc = client.load("dep.pc")
assert "Libs: -lmylib" in pc
assert 'includedir1=' in pc
assert 'Cflags: -I"${includedir1}"' in pc

0 comments on commit 27a4725

Please sign in to comment.