updated fftw3 to version 3.3.10

CMakeLists.txt

@@ -139,8 +139,8 @@ set(ENABLE_OPENMP OFF CACHE BOOL "Enables multithread in FFTW3")
 set(ENABLE_THREADS ON CACHE BOOL "Enables multithread in FFTW3")
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
 
-add_subdirectory(fftw-3.3.8)
-include_directories( fftw-3.3.8/api )
+add_subdirectory(fftw-3.3.10)
+include_directories( fftw-3.3.10/api )
 set(HAVEfftw3 1)
 set(FFTW fftw3)
 set_property(TARGET ${FFTW} PROPERTY POSITION_INDEPENDENT_CODE ON)

fftw-3.3.8/CMakeLists.txt → fftw-3.3.10/CMakeLists.txt

@@ -59,7 +59,7 @@ if (HAVE_TIME_H AND HAVE_SYS_TIME_H)
   set (TIME_WITH_SYS_TIME TRUE)
 endif ()
 
-include (CheckPrototypeDefinition) 
+include (CheckPrototypeDefinition)
 check_prototype_definition (drand48 "double drand48 (void)" "0" stdlib.h HAVE_DECL_DRAND48)
 check_prototype_definition (srand48 "void srand48(long int seedval)" "0" stdlib.h HAVE_DECL_SRAND48)
 check_prototype_definition (cosl "long double cosl( long double arg )" "0" math.h HAVE_DECL_COSL)
@@ -134,6 +134,7 @@ include (CheckCCompilerFlag)
 if (ENABLE_SSE)
   foreach (FLAG "-msse" "/arch:SSE")
     unset (HAVE_SSE CACHE)
+    unset (HAVE_SSE)
     check_c_compiler_flag (${FLAG} HAVE_SSE)
     if (HAVE_SSE)
       set (SSE_FLAG ${FLAG})
@@ -145,6 +146,7 @@ endif ()
 if (ENABLE_SSE2)
   foreach (FLAG "-msse2" "/arch:SSE2")
     unset (HAVE_SSE2 CACHE)
+    unset (HAVE_SSE2)
     check_c_compiler_flag (${FLAG} HAVE_SSE2)
     if (HAVE_SSE2)
       set (SSE2_FLAG ${FLAG})
@@ -156,6 +158,7 @@ endif ()
 if (ENABLE_AVX)
   foreach (FLAG "-mavx" "/arch:AVX")
     unset (HAVE_AVX CACHE)
+    unset (HAVE_AVX)
     check_c_compiler_flag (${FLAG} HAVE_AVX)
     if (HAVE_AVX)
       set (AVX_FLAG ${FLAG})
@@ -167,6 +170,7 @@ endif ()
 if (ENABLE_AVX2)
   foreach (FLAG "-mavx2" "/arch:AVX2")
     unset (HAVE_AVX2 CACHE)
+    unset (HAVE_AVX2)
     check_c_compiler_flag (${FLAG} HAVE_AVX2)
     if (HAVE_AVX2)
       set (AVX2_FLAG ${FLAG})
@@ -179,6 +183,7 @@ endif ()
 if (ENABLE_AVX2)
   foreach (FLAG "-mfma" "/arch:FMA")
     unset (HAVE_FMA CACHE)
+    unset (HAVE_FMA)
     check_c_compiler_flag (${FLAG} HAVE_FMA)
     if (HAVE_FMA)
       set (FMA_FLAG ${FLAG})
@@ -274,7 +279,7 @@ if (HAVE_AVX2)
   list (APPEND SOURCEFILES ${fftw_dft_simd_avx2_SOURCE} ${fftw_rdft_simd_avx2_SOURCE})
 endif ()
 
-set (FFTW_VERSION 3.3.7)
+set (FFTW_VERSION 3.3.9)
 
 set (PREC_SUFFIX)
 if (ENABLE_FLOAT)
@@ -305,7 +310,7 @@ endif ()
 
 add_library (${fftw3_lib} ${SOURCEFILES})
 target_include_directories (${fftw3_lib} INTERFACE $<INSTALL_INTERFACE:include>)
-if (MSVC)
+if (MSVC AND NOT (CMAKE_C_COMPILER_ID STREQUAL "Intel"))
   target_compile_definitions (${fftw3_lib} PRIVATE /bigobj)
 endif ()
 if (HAVE_SSE)
@@ -351,7 +356,7 @@ if (OPENMP_FOUND)
 endif ()
 
 foreach(subtarget ${subtargets})
-  set_target_properties (${subtarget} PROPERTIES SOVERSION 3.5.7 VERSION 3)
+  set_target_properties (${subtarget} PROPERTIES SOVERSION 3.6.9 VERSION 3)
   install (TARGETS ${subtarget}
 	  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 	  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -406,9 +411,9 @@ set (exec_prefix ${CMAKE_INSTALL_PREFIX})
 set (libdir ${CMAKE_INSTALL_FULL_LIBDIR})
 set (includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
 set (VERSION ${FFTW_VERSION})
-configure_file (fftw.pc.in fftw${PREC_SUFFIX}.pc @ONLY)
+configure_file (fftw.pc.in fftw3${PREC_SUFFIX}.pc @ONLY)
 install (FILES
-          ${CMAKE_CURRENT_BINARY_DIR}/fftw${PREC_SUFFIX}.pc
+          ${CMAKE_CURRENT_BINARY_DIR}/fftw3${PREC_SUFFIX}.pc
          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
          COMPONENT Development)