From 53bccfe34a7af22949b0b96d67a3006815b5f282 Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Thu, 11 May 2023 08:36:33 -0600
Subject: [PATCH] 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.
---
 build_files/cmake/platform/platform_win32.cmake | 6 +++++-
 source/creator/CMakeLists.txt                   | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 9b7256a2120..1a6059addd7 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -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()
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8616bc08a47..574ae007c1e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -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.