Просмотр исходного кода

Jamroot fixes: use right path for headers, simplify some things.

[SVN r64794]
Vladimir Prus 15 лет назад
Родитель
Сommit
0f61b0e1ec
2 измененных файлов с 5 добавлено и 5 удалено
  1. 3 4
      Jamroot
  2. 2 1
      boostcpp.jam

+ 3 - 4
Jamroot

@@ -129,6 +129,7 @@ import package ;
 import sequence ;
 import xsltproc ;
 import set ;
+import path ;
 
 path-constant BOOST_ROOT : . ;
 constant BOOST_VERSION : 1.44.0 ;
@@ -242,9 +243,7 @@ rule boost-install ( libraries * )
 
     install stage : $(libraries) : <location>$(BOOST_STAGE_LOCATE) ;
 
-    local c = [ project.current ] ;
-    local project-module = [ $(c).project-module ] ;
-    module $(project-module)
+    module [ CALLER_MODULE ]
     {
         explicit stage ;
         explicit install ;
@@ -261,4 +260,4 @@ headers =
 
 # Declare special top-level targets that build and install the desired variants
 # of the libraries.
-boostcpp.declare_targets $(all-libraries) : $(headers) ;
+boostcpp.declare-targets $(all-libraries) : $(headers) ;

+ 2 - 1
boostcpp.jam

@@ -31,6 +31,7 @@ import package ;
 ##############################################################################  
 
 BOOST_ROOT = [ modules.binding $(__name__) ] ;
+BOOST_ROOT = $(BOOST_ROOT:D) ;
 
 rule set-version ( version )
 {
@@ -552,7 +553,7 @@ rule libraries-to-install ( existing-libraries * )
    }
 }
 
-rule declare_targets ( all-libraries * : headers * )
+rule declare-targets ( all-libraries * : headers * )
 {
     configure.register-components $(all-libraries) ;
     

粤ICP备19079148号