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

Jump to bottom

conda: get Boost library with Python version #134

Merged
merged 3 commits into from
Jan 29, 2020
Merged

conda: get Boost library with Python version #134

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc9902
conda: get Boost library with Python version
bkpoon Nov 13, 2019
d2f27ee
Update SConscript
bkpoon Jan 28, 2020
83ecf4e
Move stuff
bkpoon Jan 28, 2020
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
10 changes: 6 additions & 4 deletions SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import sys
import os
import libtbx.load_env
from libtbx.env_config import get_boost_library_with_python_version

Import("env_etc")

Expand Down Expand Up @@ -47,10 +48,11 @@ if sys.platform == "win32" and env_etc.compiler == "win32_cl":
env_etc.dxtbx_includes.extend(env_etc.conda_cpppath)
env_etc.dxtbx_lib_paths.extend(env_etc.conda_libpath)
# library changes
# tiff.lib instead of libtiff.lib for newer libtiff conda packages
env_etc.dxtbx_libs = [
"tiff" if x == "libtiff" else x for x in env_etc.dxtbx_libs
]
boost_python = get_boost_library_with_python_version(
"boost_python", env_etc.conda_libpath
)
# tiff.lib instead of libtiff.lib for newer libtiff conda psackages
bkpoon marked this conversation as resolved.
Show resolved Hide resolved
env_etc.dxtbx_libs = ["tiff", "cbf", boost_python]
Anthchirp marked this conversation as resolved.
Show resolved Hide resolved
# add zlib.lib for hdf5
env_etc.dxtbx_hdf5_libs.append("zlib")

Expand Down