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 Bazel cc_library's deps and linkopts #9381

Merged
merged 1 commit into from Aug 20, 2021
Merged

Fix Bazel cc_library's deps and linkopts #9381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions conan/tools/google/bazeldeps.py
View file
Open in desktop
Expand Up @@ -48,7 +48,17 @@ def _get_dependency_buildfile_content(self, dependency):
{% if defines %}
defines = [{{ defines }}],
{% endif %}
visibility = ["//visibility:public"]
{% if linkopts %}
linkopts = [{{ linkopts }}],
{% endif %}
visibility = ["//visibility:public"],
{% if libs %}
deps = [
{% for lib in libs %}
":{{ lib }}_precompiled",
{% endfor %}
{% endif %}
],
)

""")
Expand All @@ -72,13 +82,19 @@ def _get_dependency_buildfile_content(self, dependency):
for define in dependency.new_cpp_info.defines)
defines = ', '.join(defines)

linkopts = []
for linkopt in dependency.new_cpp_info.system_libs:
linkopts.append('"-l{}"'.format(linkopt))
linkopts = ', '.join(linkopts)

context = {
"name": dependency.ref.name,
"libs": dependency.new_cpp_info.libs,
"libdir": dependency.new_cpp_info.libdirs[0],
"headers": headers,
"includes": includes,
"defines": defines
"defines": defines,
"linkopts": linkopts
}

content = Template(template).render(**context)
Expand Down
4 changes: 4 additions & 0 deletions conans/test/unittests/tools/google/test_bazeldeps.py
View file
Open in desktop
Expand Up @@ -14,6 +14,8 @@ def test_bazeldeps_dependency_buildfiles():

cpp_info = CppInfo("mypkg", "dummy_root_folder1")
cpp_info.defines = ["DUMMY_DEFINE=\"string/value\""]
cpp_info.system_libs = ["system_lib1"]
cpp_info.libs = ["lib1"]

conanfile_dep = ConanFile(Mock(), None)
conanfile_dep.cpp_info = cpp_info
Expand All @@ -31,6 +33,8 @@ def test_bazeldeps_dependency_buildfiles():
dependency_content = bazeldeps._get_dependency_buildfile_content(dependency)
assert 'cc_library(\n name = "OriginalDepName",' in dependency_content
assert 'defines = ["DUMMY_DEFINE=\'string/value\'"],' in dependency_content
assert 'linkopts = ["-lsystem_lib1"],' in dependency_content
assert 'deps = [\n \n ":lib1_precompiled",' in dependency_content


def test_bazeldeps_main_buildfile():
Expand Down