Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix frameworkdirs not taken into account in XcodeDeps generator. #11617

Merged
merged 3 commits into from Jul 12, 2022
Merged

Fix frameworkdirs not taken into account in XcodeDeps generator. #11617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fd5dc0
fix typo
czoido Jul 12, 2022
d68004e
add test
czoido Jul 12, 2022
01c8944
minor changes
czoido Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conan/tools/apple/xcodedeps.py
View file
Open in desktop
Expand Up @@ -137,7 +137,7 @@ def _merged_vars(name):
'lib_dirs': " ".join('"{}"'.format(p) for p in _merged_vars("libdirs")),
'libs': " ".join("-l{}".format(lib) for lib in _merged_vars("libs")),
'system_libs': " ".join("-l{}".format(sys_lib) for sys_lib in _merged_vars("system_libs")),
'frameworksdirs': " ".join('"{}"'.format(p) for p in _merged_vars("frameworkdirs")),
'frameworkdirs': " ".join('"{}"'.format(p) for p in _merged_vars("frameworkdirs")),
'frameworks': " ".join("-framework {}".format(framework) for framework in _merged_vars("frameworks")),
'definitions': " ".join('"{}"'.format(p.replace('"', '\\"')) for p in _merged_vars("defines")),
'c_compiler_flags': " ".join('"{}"'.format(p.replace('"', '\\"')) for p in _merged_vars("cflags")),
Expand Down
22 changes: 22 additions & 0 deletions conans/test/integration/toolchains/apple/test_xcodedeps.py
View file
Open in desktop
Expand Up @@ -174,3 +174,25 @@ def package_info(self):

# folders are aggregated
assert "mylibdir" in component4_vars


@pytest.mark.skipif(platform.system() != "Darwin", reason="Only for MacOS")
def test_xcodedeps_frameworkdirs():
client = TestClient()

conanfile_py = textwrap.dedent("""
from conan import ConanFile
class LibConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
def package_info(self):
self.cpp_info.frameworkdirs = ["lib_a_frameworkdir"]
""")

client.save({"conanfile.py": conanfile_py})
client.run("create conanfile.py lib_a/1.0@")

client.run("install lib_a/1.0@ -g XcodeDeps")

lib_a_xcconfig = client.load("conan_lib_a_lib_a_release_x86_64.xcconfig")

assert "lib_a_frameworkdir" in lib_a_xcconfig