Skip to content

Commit

Permalink
Fix frameworkdirs not taken into account in XcodeDeps generator. (#11617
Browse files Browse the repository at this point in the history
)

* fix typo

* add test

* minor changes
  • Loading branch information
czoido committed Jul 12, 2022
1 parent 5b592f7 commit 4e6001b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion conan/tools/apple/xcodedeps.py
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
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

0 comments on commit 4e6001b

Please sign in to comment.