CMake/Win: fftw adjust for filename changes in 3.6
Preparation for the the 3.6 library update landing. The filenames for these libs will change a little bit and 3.6 will add new library for the fp32 version of fftw.
This commit is contained in:
parent
6f3cf1e436
commit
53bccfe34a
@ -363,7 +363,11 @@ windows_find_package(Freetype REQUIRED)
|
||||
|
||||
if(WITH_FFTW3)
|
||||
set(FFTW3 ${LIBDIR}/fftw3)
|
||||
set(FFTW3_LIBRARIES ${FFTW3}/lib/libfftw.lib)
|
||||
if(EXISTS ${FFTW3}/lib/libfftw3-3.lib) # 3.6 libraries
|
||||
set(FFTW3_LIBRARIES ${FFTW3}/lib/libfftw3-3.lib ${FFTW3}/lib/libfftw3f.lib)
|
||||
else()
|
||||
set(FFTW3_LIBRARIES ${FFTW3}/lib/libfftw.lib) # 3.5 Libraries
|
||||
endif()
|
||||
set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
|
||||
set(FFTW3_LIBPATH ${FFTW3}/lib)
|
||||
endif()
|
||||
|
@ -886,6 +886,12 @@ elseif(WIN32)
|
||||
FILES ${LIBDIR}/fftw3/lib/libfftw3-3.dll
|
||||
ALL
|
||||
)
|
||||
if(EXISTS ${LIBDIR}/fftw3/lib/libfftw3f-3.dll)
|
||||
windows_install_shared_manifest(
|
||||
FILES ${LIBDIR}/fftw3/lib/libfftw3f-3.dll
|
||||
ALL
|
||||
)
|
||||
endif()
|
||||
if(MSVC_ASAN)
|
||||
# The ASAN DLL's can be found in the same folder as the compiler,
|
||||
# this is the easiest way to find these.
|
||||
|
Loading…
Reference in New Issue
Block a user