diff --git a/HySoP/src/CMakeLists.txt b/HySoP/src/CMakeLists.txt
index d8330f5e8c8af1aef35bea2903b15886bca464a6..702c3b3dbcaf9789eb3a2863b09769e8a9f4a4f3 100644
--- a/HySoP/src/CMakeLists.txt
+++ b/HySoP/src/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 # --- Set a version number for the package ---
 set(${PARMES_LIBRARY_NAME}_version 1.0.0)
-# --- The name of the exe to be created (test purpose)
+
 # This exe will be linked with libPARMES_LIBRARY_NAME
 set(EXE_NAME ${PARMES_LIBRARY_NAME}Run)
 
@@ -15,8 +15,14 @@ set(EXE_NAME ${PARMES_LIBRARY_NAME}Run)
 # Any file in those dirs will be used to create libparmes
 set(${PARMES_LIBRARY_NAME}_SRCDIRS
   .
-  fftw
   )
+
+if(WITH_FFTW)
+  set(${PARMES_LIBRARY_NAME}_SRCDIRS
+    ${${PARMES_LIBRARY_NAME}_SRCDIRS} fftw
+    )
+endif()
+
 # --- scales ---
 if(WITH_SCALES)
   set(${PARMES_LIBRARY_NAME}_SRCDIRS
@@ -74,15 +80,14 @@ append_Fortran_FLAGS("-Wall -fPIC")
 if(WITH_PPM)
   add_subdirectory(ppmInterface)
 endif()
-
 if(WITH_FFTW)
   find_package(FFTW REQUIRED)
   include_directories(${FFTW_INCLUDE_DIRS})
   set(LIBS ${LIBS} ${FFTW_LIBRARIES})
-endif()
-# for python setup.py
-set(FFTWLIB ${FFTW_LIBRARY} PARENT_SCOPE)
 
+  # for python setup.py
+  set(FFTWLIB ${FFTW_LIBRARY} PARENT_SCOPE)
+endif()
 # ============= Generates ParmesConfig.hpp =============
 # The file PARMES_LIBRARY_NAME_defines.hpp will be generated from config.hpp.cmake;
 if(EXISTS ${CMAKE_SOURCE_DIR}/config.hpp.cmake)
@@ -159,12 +164,14 @@ target_link_libraries(${PARMES_LIBRARY_NAME} ${LIBS})
 
 ### set(PARMES_LINKED_LIBRARIES ${LIBS} ${PARMES_LIBRARY_NAME} PARENT_SCOPE)
 # ============= Creates the executable =============
-add_executable(${EXE_NAME} ${${EXE_NAME}_SRC})
-add_dependencies(${EXE_NAME} ${PARMES_LIBRARY_NAME})
-
-# libs to link with EXE_NAME
-target_link_libraries(${EXE_NAME} ${PARMES_LIBRARY_NAME})
-target_link_libraries(${EXE_NAME} ${LIBS})
+if(WITH_FFTW)
+  add_executable(${EXE_NAME} ${${EXE_NAME}_SRC})
+  add_dependencies(${EXE_NAME} ${PARMES_LIBRARY_NAME})
+  
+  # libs to link with EXE_NAME
+  target_link_libraries(${EXE_NAME} ${PARMES_LIBRARY_NAME})
+  target_link_libraries(${EXE_NAME} ${LIBS})
+endif()
 
 # ============== Add tests ==============
 if(WITH_TESTS)