Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2020-05-19 21:28:19 +0300
committerRay Molenkamp <github@lazydodo.com>2020-05-19 21:28:19 +0300
commit08b4faef01da5207b1a864c90d1ca4353bd1e232 (patch)
tree60a78340419ebd3c07a8d3c932969dc8d34062b9 /source/creator/CMakeLists.txt
parenta6c08743554037fe235778fec3a5043e3b602c73 (diff)
Properly fix: T71040 / T58983 Ocean Modifier crashes at high resolutions
For a more detailed description of the issue see the commit message for rB497cd3d7dd6e497be484eb78a8ddb23f53b20343 This change moves fftw to a shared library and reverts the bandaid we did for 2.83.
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index b3e83b1412f..1a71022869a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -687,6 +687,13 @@ elseif(WIN32)
)
endif()
+ if(WITH_FFTW3)
+ install(
+ FILES ${LIBDIR}/fftw3/lib/libfftw3-3.dll
+ DESTINATION "."
+ )
+ endif()
+
if(WITH_WINDOWS_PDB)
if(WITH_WINDOWS_STRIPPED_PDB)
# Icky hack for older cmake from https://stackoverflow.com/a/21198501