Merge pull request #72 from grisumbras/use-install-features2

use install- features instead of package module
boostorg · Jun 14, 2024 · b0a1eb2 · b0a1eb2
2 parents 890fd2e + 3feb1aa
commit b0a1eb2
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 216 deletions.
diff --git a/Jamfile b/Jamfile
@@ -2,9 +2,11 @@
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
+import make ;
+
 project /boost/tools/boost_install ;
 
 # BoostConfigVersion.cmake
 
-generate BoostConfigVersion.cmake : : <generating-rule>@boost-install%generate-cmake-config-version <name>Boost <version>$(BOOST_VERSION) ;
+make BoostConfigVersion.cmake : : @boost-install%make-cmake-config-version : <version>$(BOOST_VERSION) ;
 explicit BoostConfigVersion.cmake ;
diff --git a/boost-install-dirs.jam b/boost-install-dirs.jam
@@ -6,60 +6,9 @@ import modules ;
 import boostcpp ;
 import package ;
 import path ;
+import stage ;
 
-# includedir
-
-rule includedir
-{
-    if ! $(.includedir)
-    {
-        local paths = [ package.paths Boost ] ;
-        .includedir = [ $(paths).includedir ] ;
-    }
-
-    return $(.includedir) ;
-}
-
-# bindir
-
-rule bindir
-{
-    if ! $(.bindir)
-    {
-        local paths = [ package.paths Boost ] ;
-        .bindir = [ $(paths).bindir ] ;
-    }
-
-    return $(.bindir) ;
-}
-
-# libdir
-
-rule libdir
-{
-    if ! $(.libdir)
-    {
-        local paths = [ package.paths Boost ] ;
-        .libdir = [ $(paths).libdir ] ;
-    }
-
-    return $(.libdir) ;
-}
-
-# cmakedir
-
-rule cmakedir
-{
-    if ! $(.cmakedir)
-    {
-        package.add-path-option cmakedir : cmake : libdir ;
-
-        local paths = [ package.paths Boost ] ;
-        .cmakedir = [ $(paths).get cmakedir ] ;
-    }
-
-    return $(.cmakedir) ;
-}
+stage.add-install-dir cmakedir : cmake : libdir ;
 
 # header-subdir