summaryrefslogtreecommitdiffstats
path: root/python/builder.py
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-04 16:35:00 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-04 16:35:00 +0100
commitf3ac1849f2b141ea1845752e1ca2317845e90e3a (patch)
treeadcdc9013af5cca4165857408ed7181ffdf0de64 /python/builder.py
parent8144bf0397ee1913b830d82058ccd40df741f1b3 (diff)
parent0d015b1c91581ee5ef3e936f03e4c62fbc7ea362 (diff)
downloadastra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.gz
astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.bz2
astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.tar.xz
astra-f3ac1849f2b141ea1845752e1ca2317845e90e3a.zip
Merge branch 'master'
Diffstat (limited to 'python/builder.py')
-rw-r--r--python/builder.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/python/builder.py b/python/builder.py
index cfdb7d1..5322182 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -41,6 +41,12 @@ try:
usecuda=True
except KeyError:
pass
+try:
+ if os.environ['CL'].find('/DASTRA_CUDA')!=-1:
+ usecuda=True
+except KeyError:
+ pass
+
cfgToWrite = 'DEF HAVE_CUDA=' + str(usecuda) + "\n"
cfgHasToBeUpdated = True
@@ -65,7 +71,7 @@ ext_modules = cythonize("astra/*.pyx", language_level=2)
cmdclass = { 'build_ext': build_ext }
setup (name = 'PyASTRAToolbox',
- version = '1.6',
+ version = '1.7',
description = 'Python interface to the ASTRA-Toolbox',
author='D.M. Pelt',
author_email='D.M.Pelt@cwi.nl',