Skip to content

Commit b9afbde

Browse files
committed
update FFTW
1 parent 71116a5 commit b9afbde

5,267 files changed

Lines changed: 221681 additions & 195353 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,6 @@ if(MSVC)
8686
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:DebugDLL>") # requires CMake 3.15+
8787
endif()
8888

89-
# build fftw
90-
# fftw's CMakeLists mishandles MSVC arch flags
91-
# so we will skip the autodetection and clear the flags
92-
# since they are not needed nor desired for a multiarch binary
93-
set(HAVE_SSE TRUE)
94-
set(SSE_FLAG "")
95-
set(HAVE_SSE2 TRUE)
96-
set(SSE2_FLAG "")
97-
set(HAVE_AVX TRUE)
98-
set(AVX_FLAG "")
99-
set(HAVE_AVX2 TRUE)
100-
set(AVX2_FLAG "")
101-
10289
set(BUILTIN_FFTW TRUE)
10390
endif()
10491

@@ -108,14 +95,15 @@ if(BUILTIN_FFTW)
10895
option(WITH_COMBINED_THREADS "Merge thread library" ON)
10996
endif()
11097
option(ENABLE_FLOAT "single-precision" ON)
111-
if(NOT MSVC AND ENABLE_X86_SIMD)
98+
if(ENABLE_X86_SIMD)
11299
option(ENABLE_SSE "Compile with SSE instruction set support" ON)
113100
option(ENABLE_SSE2 "Compile with SSE2 instruction set support" ON)
114-
#option(ENABLE_AVX "Compile with AVX instruction set support" ON) # i think this results in global VEX when building with CMake
101+
option(ENABLE_AVX "Compile with AVX instruction set support" ON)
102+
option(ENABLE_AVX2 "Compile with AVX2 instruction set support" ON)
115103
endif()
116-
add_subdirectory("deps/fftw-3.3.10" EXCLUDE_FROM_ALL)
104+
add_subdirectory("deps/fftw-3.3.11" EXCLUDE_FROM_ALL)
117105
set(FFTW_LIBRARIES fftw3f)
118-
set(FFTW_INCLUDE_DIRS "deps/fftw-3.3.10/api")
106+
set(FFTW_INCLUDE_DIRS "deps/fftw-3.3.11/api")
119107
else()
120108
find_path(FFTW_INCLUDE_DIRS fftw3.h)
121109
if(STATIC_FFTW)

0 commit comments

Comments
 (0)