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 path finder for python libraries #9059

Merged
merged 2 commits into from
Mar 2, 2022
Merged

boost: Fix path finder for python libraries #9059

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b90463f
[boost] Fix path finder for python libraries
Minimonium Jan 24, 2022
7952788
Rename function
Minimonium Feb 10, 2022
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
8 changes: 4 additions & 4 deletions recipes/boost/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ def _python_includes(self):
raise Exception("couldn't locate Python.h - make sure you have installed python development files")

@property
def _python_libraries(self):
def _python_library_dir(self):
"""
attempt to find python development library
:return: the full path to the python library to be linked with
Expand Down Expand Up @@ -702,7 +702,7 @@ def _python_libraries(self):
self.output.info("checking {}".format(python_lib))
if os.path.isfile(python_lib):
self.output.info("found python library: {}".format(python_lib))
return python_lib.replace("\\", "/")
return libdir.replace("\\", "/")
raise ConanInvalidConfiguration("couldn't locate python libraries - make sure you have installed python development files")

def _clean(self):
Expand Down Expand Up @@ -1187,11 +1187,11 @@ def create_library_config(deps_name, name):

if not self.options.without_python:
# https://www.boost.org/doc/libs/1_70_0/libs/python/doc/html/building/configuring_boost_build.html
contents += '\nusing python : {version} : "{executable}" : "{includes}" : "{libraries}" ;'\
contents += '\nusing python : {version} : "{executable}" : "{includes}" : "{library_dir}" ;'\
.format(version=self._python_version,
executable=self._python_executable,
includes=self._python_includes,
libraries=self._python_libraries)
library_dir=self._python_library_dir)

if not self.options.without_mpi:
# https://www.boost.org/doc/libs/1_72_0/doc/html/mpi/getting_started.html
Expand Down