Fix header-only installation of Boost. (#14995)

This commit is contained in:
Sergey Kosukhin 2020-02-16 22:30:32 +01:00 committed by GitHub
parent 60847abf0e
commit 1cc7a3533b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -405,15 +405,6 @@ def install(self, spec, prefix):
for lib in Boost.all_libs: for lib in Boost.all_libs:
if "+{0}".format(lib) in spec: if "+{0}".format(lib) in spec:
with_libs.append(lib) with_libs.append(lib)
if not with_libs:
# if no libraries are specified for compilation, then you dont have
# to configure/build anything, just copy over to the prefix
# directory.
src = join_path(self.stage.source_path, 'boost')
mkdirp(join_path(prefix, 'include'))
dst = join_path(prefix, 'include', 'boost')
install_tree(src, dst)
return
# Remove libraries that the release version does not support # Remove libraries that the release version does not support
if spec.satisfies('@1.69.0:') and 'signals' in with_libs: if spec.satisfies('@1.69.0:') and 'signals' in with_libs:
@ -433,6 +424,16 @@ def install(self, spec, prefix):
if '+graph' in spec and '+mpi' in spec: if '+graph' in spec and '+mpi' in spec:
with_libs.append('graph_parallel') with_libs.append('graph_parallel')
if not with_libs:
# if no libraries are specified for compilation, then you dont have
# to configure/build anything, just copy over to the prefix
# directory.
src = join_path(self.stage.source_path, 'boost')
mkdirp(join_path(prefix, 'include'))
dst = join_path(prefix, 'include', 'boost')
install_tree(src, dst)
return
# to make Boost find the user-config.jam # to make Boost find the user-config.jam
env['BOOST_BUILD_PATH'] = self.stage.source_path env['BOOST_BUILD_PATH'] = self.stage.source_path