diff options
| author | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
|---|---|---|
| committer | Joe Hunkeler <jhunkeler@gmail.com> | 2015-10-01 14:12:20 -0400 |
| commit | 97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53 (patch) | |
| tree | b85aa67a9968cf37c1ea5a0e38545f77ebd01b00 /pyfftw | |
| parent | 28c2e18e1bfbb891a822da179aeeebf67320c873 (diff) | |
| parent | 4b00c5abebcd321fd95755c4816d2fd6790a172b (diff) | |
| download | cbc-recipes-97daa8c0b8e9bb79645e2b0d4b65f5c9c49e8f53.tar.gz | |
Fix conflict
Diffstat (limited to 'pyfftw')
| -rw-r--r-- | pyfftw/pyfftw.ini | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini index bf6afd4..3139f13 100644 --- a/pyfftw/pyfftw.ini +++ b/pyfftw/pyfftw.ini @@ -17,15 +17,15 @@ number : 1 [requirements] build : - numpy + numpy >=1.9 fftw cython setuptools python run : - numpy + numpy >=1.9 fftw - python + python [cbc_build] linux : @@ -33,6 +33,7 @@ linux : export LDFLAGS="`pkg-config --libs fftw3`" python setup.py install || exit 1 windows : - python setup.py install - if errorlevel 1 exit 1 + # You're on your own with the libraries, it seems. + python setup.py install + if errorlevel 1 exit 1 |