diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-05 19:46:31 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-05 19:46:31 +0400 |
| commit | 2b962212c8be78603dc49fecaf080f44614af8ee (patch) | |
| tree | 975f98532fb11e1f561ca12b0ad7c3feaec4a721 /CMakeLists.txt | |
| parent | 4742dc3fd747564636c36e40c88687ccc725a1c7 (diff) | |
Fix #33411: crash baking smoke with FFT high resolution.
CMake had FFTW disabled by default, and when FFTW was not enabled it lead to
uninitialized memory usage. Now it falls back to wavelet if there is no FFTW,
and I've enabled it by default in CMake. If it's not found on Linux it will get
disabled automatically.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b642bb24c6..23e9eba0cf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ option(WITH_PYTHON_MODULE "Enable building as a python module which runs without option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON) option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON) option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON) -option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF) +option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" ON) option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_GAMEENGINE "Enable Game Engine" ON) option(WITH_PLAYER "Build Player" OFF) @@ -387,10 +387,6 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL) endif() -if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM) - message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON") -endif() - # may as well build python module without a UI if(WITH_PYTHON_MODULE) set(WITH_HEADLESS ON) @@ -1670,6 +1666,10 @@ if(APPLE OR WIN32) endif() endif() +if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM) + message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON") +endif() + if(WITH_CYCLES) if(NOT WITH_OPENIMAGEIO) message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES") |