aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hunkeler <jhunkeler@gmail.com>2015-10-01 14:10:38 -0400
committerJoe Hunkeler <jhunkeler@gmail.com>2015-10-01 14:10:38 -0400
commit28c2e18e1bfbb891a822da179aeeebf67320c873 (patch)
treeff97170a3a5eb6250a6e5c2c14f3845a25111a01
parent6fd1cc9c3129cd5c2da620626e2b2574654b83b6 (diff)
downloadcbc-recipes-28c2e18e1bfbb891a822da179aeeebf67320c873.tar.gz
Make sure fftw finds the conda installed versions
-rw-r--r--fftw/fftw.ini4
-rw-r--r--pyfftw/pyfftw.ini5
2 files changed, 6 insertions, 3 deletions
diff --git a/fftw/fftw.ini b/fftw/fftw.ini
index c8ab085..d8a6595 100644
--- a/fftw/fftw.ini
+++ b/fftw/fftw.ini
@@ -12,13 +12,13 @@ fn : ${package:name}-${package:version}.tar.gz
url : ${about:home}/${fn}
[build]
-number : 0
+number : 4
[requirements]
build :
#none
run :
- #none
+ pkgconfig
[cbc_build]
linux :
diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini
index 0f0c4b5..bf6afd4 100644
--- a/pyfftw/pyfftw.ini
+++ b/pyfftw/pyfftw.ini
@@ -13,12 +13,13 @@ fn : pyFFTW-${package:version}.tar.gz
url : https://pypi.python.org/packages/source/p/pyFFTW/${fn}
[build]
-number : 0
+number : 1
[requirements]
build :
numpy
fftw
+ cython
setuptools
python
run :
@@ -28,6 +29,8 @@ run :
[cbc_build]
linux :
+ export CFLAGS="`pkg-config --cflags fftw3`"
+ export LDFLAGS="`pkg-config --libs fftw3`"
python setup.py install || exit 1
windows :
python setup.py install