Merge pull request #14 from jwm-art-net/master

fix cmake build to find fftw_threads

src/CMakeLists.txt

@@ -96,6 +96,7 @@ add_executable(SmartDeblur
 add_dependencies(SmartDeblur FFTW)
 target_link_libraries(SmartDeblur
   ${FFTW_LIBRARIES}
+  ${FFTW_THREADS_LIBRARIES}
   ${QT_LIBRARIES}
   )
 

src/CMakeModules/FindFFTW.cmake

@@ -0,0 +1,107 @@
+# - Try to find FFTW.
+# Usage: find_package(FFTW [COMPONENTS [single double long-double threads]])
+#
+# Variables used by this module:
+#  FFTW_ROOT_DIR             - FFTW root directory
+# Variables defined by this module:
+#  FFTW_FOUND                - system has FFTW
+#  FFTW_INCLUDE_DIR          - the FFTW include directory (cached)
+#  FFTW_INCLUDE_DIRS         - the FFTW include directories
+#                               (identical to FFTW_INCLUDE_DIR)
+#  FFTW[FL]?_LIBRARY         - the FFTW library - double, single(F), 
+#                               long-double(L) precision (cached)
+#  FFTW[FL]?_THREADS_LIBRARY - the threaded FFTW library - double, single(F), 
+#                               long-double(L) precision (cached)
+#  FFTW_LIBRARIES            - list of all FFTW libraries found
+
+# Copyright (C) 2009-2010
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file was part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id: FindFFTW.cmake 15918 2010-06-25 11:12:42Z loose $
+
+# This file is now part of the SmartDeblur project
+# modifed for the purpose by James W. Morris (jwm-art.net)
+
+
+# Use double precision by default.
+if(FFTW_FIND_COMPONENTS MATCHES "^$")
+  set(_components double)
+else()
+  set(_components ${FFTW_FIND_COMPONENTS})
+endif()
+
+# Loop over each component.
+set(_libraries)
+set(_type_specified OFF)
+foreach(_comp ${_components})
+  if(_comp STREQUAL "single")
+    list(APPEND _libraries fftw3f)
+    set(_type_specified ON)
+  elseif(_comp STREQUAL "double")
+    list(APPEND _libraries fftw3)
+    set(_type_specified ON)
+  elseif(_comp STREQUAL "long-double")
+    list(APPEND _libraries fftw3l)
+    set(_type_specified ON)
+  elseif(_comp STREQUAL "threads")
+    set(_use_threads ON)
+  else(_comp STREQUAL "single")
+    message(FATAL_ERROR "FindFFTW: unknown component `${_comp}' specified. "
+      "Valid components are `single', `double', `long-double', and `threads'.")
+  endif(_comp STREQUAL "single")
+endforeach(_comp ${_components})
+
+if(NOT _type_specified)
+  message(FATAL_ERROR "FindFFTW: threads component specified without type. "
+      "Valid components are `single', `double', `long-double', and `threads'.")
+endif(NOT _type_specified)
+
+# If using threads, we need to link against threaded libraries as well.
+if(_use_threads)
+  set(_thread_libs)
+  foreach(_lib ${_libraries})
+    list(APPEND _thread_libs ${_lib}_threads)
+  endforeach(_lib ${_libraries})
+  set(_libraries ${_thread_libs} ${_libraries})
+message("_libraries:'${_libraries}'")
+endif(_use_threads)
+
+# Keep a list of variable names that we need to pass on to
+# find_package_handle_standard_args().
+set(_check_list)
+
+# Search for all requested libraries.
+foreach(_lib ${_libraries})
+  string(TOUPPER ${_lib} _LIB)
+  find_library(${_LIB}_LIBRARY ${_lib}
+    HINTS ${FFTW_ROOT_DIR} PATH_SUFFIXES lib)
+  mark_as_advanced(${_LIB}_LIBRARY)
+  list(APPEND FFTW_LIBRARIES ${${_LIB}_LIBRARY})
+  list(APPEND _check_list ${_LIB}_LIBRARY)
+endforeach(_lib ${_libraries})
+
+# Search for the header file.
+find_path(FFTW_INCLUDE_DIR fftw3.h 
+  HINTS ${FFTW_ROOT_DIR} PATH_SUFFIXES include)
+mark_as_advanced(FFTW_INCLUDE_DIR)
+list(APPEND _check_list FFTW_INCLUDE_DIR)
+
+# Handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FFTW DEFAULT_MSG ${_check_list})

src/FFTW/External_FFTW.cmake

@@ -27,8 +27,8 @@ set(FFTW_THREADS_CONFIGURATION --enable-threads)
 ## Perhaps in the future a set of TryCompiles could be used here.
 set(FFTW_OPTIMIZATION_CONFIGURATION "" CACHE INTERNAL "architecture flags: --enable-sse --enable-sse2 --enable-altivec --enable-mips-ps --enable-cell")
 if(USE_SYSTEM_FFTW)
-  find_library(FFTW_LIBRARIES ${CMAKE_SHARED_LIBRARY_PREFIX}fftw3${CMAKE_SHARED_LIBRARY_SUFFIX})
-  find_path(FFTW_INCLUDES fftw3.h)
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
+  find_package(FFTW REQUIRED COMPONENTS double threads)
 else()
   set(FFTW_COMPILER_FLAGS
     CC=${CMAKE_C_COMPILER}