From e5bf0cbe7eb556d4aa217bf25dc12229d5a4719e Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 11 Aug 2015 13:48:48 -0400 Subject: Fix empty GIT_DESCRIBE_TAG default (0.0.0) --- pyfftw/pyfftw.ini | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pyfftw') diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini index 0f0c4b5..97ce1d9 100644 --- a/pyfftw/pyfftw.ini +++ b/pyfftw/pyfftw.ini @@ -17,19 +17,20 @@ number : 0 [requirements] build : - numpy + numpy >=1.9 fftw - setuptools - python + setuptools + python run : - numpy + numpy >=1.9 fftw - python + python [cbc_build] linux : - python setup.py install || exit 1 + python setup.py install || exit 1 + windows : - python setup.py install - if errorlevel 1 exit 1 + python setup.py install + if errorlevel 1 exit 1 -- cgit From 55f9c59c25d08e3c01840b04333a58cf4485b5fe Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 10:23:19 -0400 Subject: Force pkg-config usage --- pyfftw/pyfftw.ini | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pyfftw') diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini index 97ce1d9..e9b9838 100644 --- a/pyfftw/pyfftw.ini +++ b/pyfftw/pyfftw.ini @@ -28,9 +28,12 @@ run : [cbc_build] linux : + export CFLAGS="`pkg-config --cflags fftw3`" + export LDFLAGS="`pkg-config --libs fftw3`" python setup.py install || exit 1 windows : + # You're on your own with the libraries, it seems. python setup.py install if errorlevel 1 exit 1 -- cgit