diff options
| author | Holger Kohr <h.kohr@cwi.nl> | 2016-11-23 10:21:55 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-25 13:04:36 +0100 |
| commit | eeffd2d9748b8912b384a5764b808f5bfc850ade (patch) | |
| tree | 5d257bcde2688d3d4ec84191cd5ac60af918f85a /build | |
| parent | 3a68fbe656c1984b6cf1b921d29225807d4d4ca0 (diff) | |
| download | astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.tar.gz astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.tar.bz2 astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.tar.xz astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.zip | |
Separate C++ and python builds & make conda work nicely
- make builder (= advanced user or us ourselves) choose compilers
and CUDA
- add a check for the C++11 flag for nvcc to work around the
infamous boost bug if necessary
- use conda boost to build the C++ library
- simplify python bindings conda recipe to only build the bindings;
the C++ library is now a build and runtime dependency
- add runtime dependencies to python bindings recipe
- some small adjustments to builder.py
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac index e562e77..3a2a92b 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -228,8 +228,8 @@ if test x"$with_python" != x -a x"$with_python" != xno; then AC_MSG_CHECKING(for Cython module) ASTRA_TRY_PYTHON([ import Cython -from distutils.version import LooseVersion -assert(LooseVersion(Cython.__version__)>=LooseVersion("0.13")) +from pkg_resources import parse_version +assert(parse_version(Cython.__version__) >= parse_version("0.13")) ],,HAVEPYTHON=no) if test x$HAVEPYTHON = xno; then AC_MSG_RESULT(no) |