Feature/b2 rooted dep projects (#4211)

* declares projects created by b2 generator rooted fixes #4200 * updated the b2 generator test * changed to only root declared project for jamroot modules
conan-io · Jan 14, 2019 · 33f15dd · 33f15dd
1 parent 0f5069c
commit 33f15dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/conans/client/generators/b2.py b/conans/client/generators/b2.py
@@ -328,6 +328,10 @@ def b2_toolset_version(self):
         : constant-if call-in-project
         : $(id-mod)
         : constant-if call-in-project ;
+    if [ project.is-jamroot-module $(base-project-mod) ]
+    {
+        use-project /$(id) : $(id) ;
+    }
     return $(id-mod) ;
 }
 

diff --git a/conans/test/unittests/client/generators/b2_test.py b/conans/test/unittests/client/generators/b2_test.py
@@ -81,6 +81,10 @@ def b2_test(self):
         : constant-if call-in-project
         : $(id-mod)
         : constant-if call-in-project ;
+    if [ project.is-jamroot-module $(base-project-mod) ]
+    {
+        use-project /$(id) : $(id) ;
+    }
     return $(id-mod) ;
 }