Skip to content

Commit d77d0e9

Browse files
pdimovpdimov
authored
Merge pull request #77 from grisumbras/fix/libs-wrong-package-name
default install-package to Boost
2 parents bc88ec5 + aa4ca5e commit d77d0e9

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎boost-install.jam‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,15 +1023,15 @@ local rule install-cmake-config- ( install-or-stage : version : name : requireme
10231023
local reqs = <version>$(version) <flags>library-type=$(library-type) <flags>name=$(name) ;
10241024

10251025
r += [ make $(install-or-stage)/$(name)-config.cmake : $(name) : @boost-install%make-cmake-config : $(reqs) $(requirements) ] ;
1026-
r += [ install $(install-or-stage)-$(name)-config.cmake : $(install-or-stage)/$(name)-config.cmake : <location>$(loc) $(requirements) ] ;
1026+
r += [ install $(install-or-stage)-$(name)-config.cmake : $(install-or-stage)/$(name)-config.cmake : <location>$(loc) $(requirements) : <install-package>Boost ] ;
10271027

10281028
r += [ make $(install-or-stage)/$(name)-config-version.cmake : $(name) : @boost-install%make-cmake-config-version : $(reqs) $(requirements) ] ;
1029-
r += [ install $(install-or-stage)-$(name)-config-version.cmake : $(install-or-stage)/$(name)-config-version.cmake : <location>$(loc) $(requirements) ] ;
1029+
r += [ install $(install-or-stage)-$(name)-config-version.cmake : $(install-or-stage)/$(name)-config-version.cmake : <location>$(loc) $(requirements) : <install-package>Boost ] ;
10301030

10311031
if $(library-type) != INTERFACE
10321032
{
10331033
r += [ generate $(install-or-stage)/$(name)-variant.cmake : $(name) : <generating-rule>@boost-install%generate-cmake-variant $(reqs) ] ;
1034-
r += [ install $(install-or-stage)-$(name)-config-variant.cmake : $(install-or-stage)/$(name)-variant.cmake : <location>$(loc) $(requirements) ] ;
1034+
r += [ install $(install-or-stage)-$(name)-config-variant.cmake : $(install-or-stage)/$(name)-variant.cmake : <location>$(loc) $(requirements) : <install-package>Boost ] ;
10351035
}
10361036
}
10371037
else
@@ -1083,19 +1083,19 @@ rule install-or-stage-cmake-config ( name * : install-or-stage )
10831083
local boost-install-dir = [ modules.binding $(__name__) ] ;
10841084
boost-install-dir = $(boost-install-dir:D) ;
10851085

1086-
install $(install-or-stage)-detect-toolset : $(boost-install-dir)/BoostDetectToolset.cmake : <location>(cmakedir) <name>BoostDetectToolset-$(BOOST_VERSION).cmake $(reqs) ;
1086+
install $(install-or-stage)-detect-toolset : $(boost-install-dir)/BoostDetectToolset.cmake : <location>(cmakedir) <name>BoostDetectToolset-$(BOOST_VERSION).cmake $(reqs) : <install-package>Boost ;
10871087
$(p).mark-target-as-explicit $(install-or-stage)-detect-toolset ;
10881088

10891089
# Target install/stage-boost-config
10901090

1091-
install $(install-or-stage)-boost-config : $(boost-install-dir)/BoostConfig.cmake : <location>(cmakedir)/Boost-$(BOOST_VERSION) $(reqs) ;
1091+
install $(install-or-stage)-boost-config : $(boost-install-dir)/BoostConfig.cmake : <location>(cmakedir)/Boost-$(BOOST_VERSION) $(reqs) : <install-package>Boost ;
10921092
$(p).mark-target-as-explicit $(install-or-stage)-boost-config ;
10931093

10941094
# Target install/stage-boost-config-version
10951095

10961096
project.load [ path.make $(boost-install-dir) ] ;
10971097

1098-
install $(install-or-stage)-boost-config-version : /boost/boost_install//BoostConfigVersion.cmake : <location>(cmakedir)/Boost-$(BOOST_VERSION) $(reqs) ;
1098+
install $(install-or-stage)-boost-config-version : /boost/boost_install//BoostConfigVersion.cmake : <location>(cmakedir)/Boost-$(BOOST_VERSION) $(reqs) : <install-package>Boost ;
10991099
$(p).mark-target-as-explicit $(install-or-stage)-boost-config-version ;
11001100

11011101
# Target install/stage-cmake-config
@@ -1257,28 +1257,28 @@ rule boost-install ( libraries * )
12571257

12581258
if ! [ $(p).has-alternative-for-target install ]
12591259
{
1260-
install install-libraries-static : $(libraries) : <location>(libdir) <install-dependencies>on <install-type>STATIC_LIB ;
1260+
install install-libraries-static : $(libraries) : <location>(libdir) <install-dependencies>on <install-type>STATIC_LIB : <install-package>Boost ;
12611261
$(p).mark-target-as-explicit install-libraries-static ;
12621262

12631263
alias install-libraries-shared : install-libraries-shared- ;
12641264
alias install-libraries-shared : install-libraries-shared-cygwin : <target-os>cygwin ;
12651265
$(p).mark-target-as-explicit install-libraries-shared ;
12661266

1267-
install install-libraries-shared- : $(libraries) : <location>(libdir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
1267+
install install-libraries-shared- : $(libraries) : <location>(libdir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on : <install-package>Boost ;
12681268
$(p).mark-target-as-explicit install-libraries-shared- ;
12691269

1270-
install install-libraries-shared-cygwin : $(libraries) : <location>(bindir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
1270+
install install-libraries-shared-cygwin : $(libraries) : <location>(bindir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on : <install-package>Boost ;
12711271
$(p).mark-target-as-explicit install-libraries-shared-cygwin ;
12721272

1273-
install install-unprefixed-static : $(unprefixed) : <install-type>STATIC_LIB <conditional>@boost-install%install-subdir ;
1273+
install install-unprefixed-static : $(unprefixed) : <install-type>STATIC_LIB <conditional>@boost-install%install-subdir : <install-package>Boost ;
12741274
$(p).mark-target-as-explicit install-unprefixed-static ;
12751275

1276-
install install-unprefixed-shared : $(unprefixed) : <install-type>SHARED_LIB <install-no-version-symlinks>on <conditional>@boost-install%install-subdir ;
1276+
install install-unprefixed-shared : $(unprefixed) : <install-type>SHARED_LIB <install-no-version-symlinks>on <conditional>@boost-install%install-subdir : <install-package>Boost ;
12771277
$(p).mark-target-as-explicit install-unprefixed-shared ;
12781278

12791279
install-cmake-config $(libraries) ;
12801280

1281-
generate install-dependencies : $(libraries) : <generating-rule>@boost-install%generate-dependencies <name>install ;
1281+
generate install-dependencies : $(libraries) : <generating-rule>@boost-install%generate-dependencies <name>install : <install-package>Boost ;
12821282
$(p).mark-target-as-explicit install-dependencies ;
12831283

12841284
alias install : install-libraries-static install-libraries-shared install-unprefixed-static install-unprefixed-shared install-cmake-config install-dependencies ;
@@ -1294,19 +1294,19 @@ rule boost-install ( libraries * )
12941294

12951295
stage-cmake-config $(libraries) ;
12961296

1297-
install stage-libraries-static : $(libraries) : <location>(libdir) $(reqs) <install-dependencies>on <install-type>STATIC_LIB ;
1297+
install stage-libraries-static : $(libraries) : <location>(libdir) $(reqs) <install-dependencies>on <install-type>STATIC_LIB : <install-package>Boost ;
12981298
$(p).mark-target-as-explicit stage-libraries-static ;
12991299

1300-
install stage-libraries-shared : $(libraries) : <location>(libdir) $(reqs) <install-dependencies>on <install-type>SHARED_LIB <install-type>PDB <install-no-version-symlinks>on ;
1300+
install stage-libraries-shared : $(libraries) : <location>(libdir) $(reqs) <install-dependencies>on <install-type>SHARED_LIB <install-type>PDB <install-no-version-symlinks>on : <install-package>Boost ;
13011301
$(p).mark-target-as-explicit stage-libraries-shared ;
13021302

1303-
install stage-unprefixed-static : $(unprefixed) : <install-type>STATIC_LIB $(reqs) <conditional>@boost-install%install-subdir ;
1303+
install stage-unprefixed-static : $(unprefixed) : <install-type>STATIC_LIB $(reqs) <conditional>@boost-install%install-subdir : <install-package>Boost ;
13041304
$(p).mark-target-as-explicit stage-unprefixed-static ;
13051305

1306-
install stage-unprefixed-shared : $(unprefixed) : <install-type>SHARED_LIB $(reqs) <install-type>PDB <install-no-version-symlinks>on <conditional>@boost-install%install-subdir ;
1306+
install stage-unprefixed-shared : $(unprefixed) : <install-type>SHARED_LIB $(reqs) <install-type>PDB <install-no-version-symlinks>on <conditional>@boost-install%install-subdir : <install-package>Boost ;
13071307
$(p).mark-target-as-explicit stage-unprefixed-shared ;
13081308

1309-
generate stage-dependencies : $(libraries) : <generating-rule>@boost-install%generate-dependencies <name>stage ;
1309+
generate stage-dependencies : $(libraries) : <generating-rule>@boost-install%generate-dependencies <name>stage : <install-package>Boost ;
13101310
$(p).mark-target-as-explicit stage-dependencies ;
13111311

13121312
alias stage : stage-libraries-static stage-libraries-shared stage-unprefixed-static stage-unprefixed-shared stage-cmake-config stage-dependencies ;

0 commit comments

Comments
 (0)