From 7a47712784aa5310bc550e5cc71c0dbcb3e01d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franck=20P=C3=A9rignon?= <franck.perignon@imag.fr>
Date: Wed, 11 Jul 2012 17:09:17 +0000
Subject: [PATCH] update python setup
---
HySoP/CMakeLists.txt | 3 +++
HySoP/setup.py.in | 8 ++++++--
HySoP/src/CMakeLists.txt | 4 +++-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/HySoP/CMakeLists.txt b/HySoP/CMakeLists.txt
index 3aed93540..f8455d9c1 100644
--- a/HySoP/CMakeLists.txt
+++ b/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)
diff --git a/HySoP/setup.py.in b/HySoP/setup.py.in
index fdae55100..e74a6d9d0 100644
--- a/HySoP/setup.py.in
+++ b/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,
diff --git a/HySoP/src/CMakeLists.txt b/HySoP/src/CMakeLists.txt
index 582270d58..b7385e1d6 100644
--- a/HySoP/src/CMakeLists.txt
+++ b/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;
--
GitLab