Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boost/*: fix compiling boost with zstd #14883

Closed
wants to merge 1 commit into from
+6 −3
Closed

boost/*: fix compiling boost with zstd #14883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions recipes/boost/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,12 +1180,15 @@ def _create_user_config_jam(self, folder):

contents = ""
if self._zip_bzip2_requires_needed:
def create_library_config(deps_name, name):
def create_library_config(deps_name, name, component=None):
includedir = self.dependencies[deps_name].cpp_info.includedirs[0].replace("\\", "/")
includedir = f"\"{includedir}\""
libdir = self.dependencies[deps_name].cpp_info.libdirs[0].replace("\\", "/")
libdir = f"\"{libdir}\""
lib = self.dependencies[deps_name].cpp_info.libs[0]
if component is None:
lib = self.dependencies[deps_name].cpp_info.libs[0]
else:
lib = self.dependencies[deps_name].cpp_info.components[component].libs[0]
version = self.dependencies[deps_name].ref.version
return f"\nusing {name} : {version} : " \
f"<include>{includedir} " \
Expand All @@ -1200,7 +1203,7 @@ def create_library_config(deps_name, name):
if self._with_lzma:
contents += create_library_config("xz_utils", "lzma")
if self._with_zstd:
contents += create_library_config("zstd", "zstd")
contents += create_library_config("zstd", "zstd", "zstdlib")

if not self.options.without_python:
# https://www.boost.org/doc/libs/1_70_0/libs/python/doc/html/building/configuring_boost_build.html
Expand Down