From cf2d1efbac416dea6adaf391386e4ba791b265f8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 16 Oct 2019 10:27:59 +0300 Subject: [PATCH] removed duplicated line in b2 output (#5811) --- conans/client/generators/b2.py | 2 +- conans/test/unittests/client/generators/b2_test.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conans/client/generators/b2.py b/conans/client/generators/b2.py index 3583d1399bd..3ec4a10ff01 100644 --- a/conans/client/generators/b2.py +++ b/conans/client/generators/b2.py @@ -43,7 +43,6 @@ def content(self): cbi += [self.conanbuildinfo_prefix_text] # The sub-project definitions, i.e. 3. for dep_name, dep_cpp_info in self.deps_build_info.dependencies: - cbi += ["", "# %s" % (dep_name.lower())] cbi += self.b2_project_for_dep(dep_name, dep_cpp_info) # The postfix which does 4. cbi += [self.conanbuildinfo_postfix_text] @@ -390,6 +389,7 @@ def b2_toolset(self): """ conanbuildinfo_project_template = """\ + # {name} project-define {name} ; """ diff --git a/conans/test/unittests/client/generators/b2_test.py b/conans/test/unittests/client/generators/b2_test.py index 9bd08ff847e..dd97abc5328 100644 --- a/conans/test/unittests/client/generators/b2_test.py +++ b/conans/test/unittests/client/generators/b2_test.py @@ -161,12 +161,10 @@ def b2_empty_settings_test(self): } -# mypkg # mypkg project-define mypkg ; -# mypkg2 # mypkg2 project-define mypkg2 ;