update python setup

HySoP/CMakeLists.txt

@@ -74,6 +74,9 @@ set(PARMES_LIBRARY_NAME parmes)
 set(PACKAGE_NAME Parmes)
 add_subdirectory(src)
 
+display(FFTWLIB)
+
+
 # ============= Generates setup.py =============
 # The file setup.py will be generated from setup.py.in.
 if(EXISTS ${CMAKE_SOURCE_DIR}/setup.py.in)

HySoP/setup.py.in

@@ -56,11 +56,15 @@ testf2pyModule=Extension(name='parmepy.testf2py',f2py_options=f2py_options,sourc
 
 ext_modules.append(testf2pyModule)
 
-withfftw = "OFF"#"@WITH_FFTW@"
+withfftw = "@WITH_FFTW@"
 
 if(withfftw is "ON"):
     fortran_src = glob.glob('@CMAKE_SOURCE_DIR@/parmepy/parmesfftw2py/*.f90')
-    #    sys.path.extend('config_fc -DF2PY_REPORT_ON_ARRAY_COPY'.split())
+    fftwdir = '@FFTWLIB@'
+    fftwdir = os.path.split(fftwdir)[0]
+    parmeslib.append('fftw3')
+    parmeslib.append('fftw3_mpi')
+    parmes_libdir.append(fftwdir)
     parpyModule = Extension(name='parmepy.fftw2py',
                             f2py_options=f2py_options,
                             sources=fortran_src,

HySoP/src/CMakeLists.txt

@@ -15,7 +15,7 @@ set(EXE_NAME ${PARMES_LIBRARY_NAME}Run)
 # Any file in those dirs will be used to create libparmes
 set(${PARMES_LIBRARY_NAME}_SRCDIRS 
   .
-  #poisson
+  poisson
   #src/interfaces/Fortran2Cpp
   #  src/interfaces/ppm
   )
@@ -96,6 +96,8 @@ if(WITH_FFTW)
   include_directories(${FFTW_INCLUDE_DIRS})
   set(LIBS ${LIBS} ${FFTW_LIBRARIES})
 endif()
+# for python setup.py
+set(FFTWLIB ${FFTW_LIBRARY} PARENT_SCOPE)
 
 # ============= Generates ParmesConfig.hpp =============
 # The file PARMES_LIBRARY_NAME_defines.hpp will be generated from config.hpp.cmake;