[Bf-blender-cvs] [bbe7c278d22] master: CMake: enable FFTW for headless & bpy configurations

[Campbell Barton]

Commit: bbe7c278d22aad14541844055d2e6ae782a873bf
Author: Campbell Barton
Date:   Sun Jan 5 16:16:03 2020 +1100
Branches: master
https://developer.blender.org/rBbbe7c278d22aad14541844055d2e6ae782a873bf

CMake: enable FFTW for headless & bpy configurations

This caused the ocean modifier to be disabled.

===================================================================

M	build_files/cmake/config/blender_headless.cmake
M	build_files/cmake/config/bpy_module.cmake

===================================================================

diff --git a/build_files/cmake/config/blender_headless.cmake b/build_files/cmake/config/blender_headless.cmake
index a07a3a7f66c..53163986b7a 100644
--- a/build_files/cmake/config/blender_headless.cmake
+++ b/build_files/cmake/config/blender_headless.cmake
@@ -10,7 +10,6 @@ set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE)
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesn't hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
 set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/bpy_module.cmake b/build_files/cmake/config/bpy_module.cmake
index 99bf17475c8..188315f58f2 100644
--- a/build_files/cmake/config/bpy_module.cmake
+++ b/build_files/cmake/config/bpy_module.cmake
@@ -15,7 +15,6 @@ set(WITH_PYTHON_INSTALL      OFF CACHE BOOL "" FORCE)
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesn't hold the audio device and loads quickly.
 set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
-set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
 set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 set(WITH_SDL                 OFF CACHE BOOL "" FORCE)
 set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)