Merge pull request #44 from ww1g11/master

bug fix for setup.py

Author: rpep

bin/install-fftw.sh

@@ -30,7 +30,7 @@ download_and_install() {
         tar -xzf ${1}.tar.gz
         cd ${1}
         echo "Configuring "${1}"."
-        ./configure --quiet --enable-shared --prefix=${LIBS_DIR} $3
+        ./configure --quiet --enable-shared --enable-openmp --prefix=${LIBS_DIR}
         echo "Compiling and installing "${1}"."
         {
             make
@@ -41,6 +41,6 @@ download_and_install() {
     fi;
 }
 
-download_and_install ${FFTW} http://www.fftw.org "--enable-openmp --enable-avx"
+download_and_install ${FFTW} http://www.fftw.org
 
 echo "Installation succesful."

doc/install.rst

@@ -217,16 +217,18 @@ Notes:
   failed without a working X server).
 
 Install on OS X
-===============
+=================
 
 The inbuilt OS X gcc compiler (actually clang) doesn't have OpenMP support. A workaround is to
 
 - install gcc5 (via homebrew, for example: ``brew install gcc --without-multilib``)
 - set CC environment variable to point to that compiler: ``export CC=gcc-5``
 
+Alternatively, gcc can be installed through ``sudo port install gcc5`` and CC environment 
+variable can be set via ``export CC=gcc-mp-5``
 
-Once this is done, run ``bin/install.sh`` which will compile fftw3 and
-sundials (in a local subdirectory) using this compiler.
+Once this is done, run ``bin/install-fftw.sh`` and ``bin/install-sundials.sh`` which will 
+compile fftw3 and sundials (in a local subdirectory) using this compiler.
 
 Also install pytest (``conda install pytest`` if using conda) and
 ``pyvtk`` via pip (``pip install pyvtk``).

setup.py

@@ -87,7 +87,7 @@ def glob_cfiles(path, excludes):
     com_link.append('-openmp')
 else:
     com_args.append('-fopenmp')
-    com_args.append('-fopenmp')
+    com_link.append('-fopenmp')
 
 
 com_inc = [numpy.get_include(), INCLUDE_DIR]