diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 3 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 3 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 3 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 4 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 4 |
6 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e3e6f8c0c66..6f8b512b69b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,8 +242,7 @@ endif() # Modifiers -option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON) -option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON) +option(WITH_MOD_FLUID "Enable Mantaflow Fluid Simulation Framework" ON) option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" ON) diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 2425354aa76..f5cfedc8ea7 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -30,9 +30,8 @@ set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE) set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE) set(WITH_LZMA ON CACHE BOOL "" FORCE) set(WITH_LZO ON CACHE BOOL "" FORCE) -set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE) -set(WITH_MOD_SMOKE ON CACHE BOOL "" FORCE) +set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE) set(WITH_AUDASPACE ON CACHE BOOL "" FORCE) set(WITH_OPENAL ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 3a67836d253..8cb5195aa2e 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -37,9 +37,8 @@ set(WITH_INTERNATIONAL OFF CACHE BOOL "" FORCE) set(WITH_JACK OFF CACHE BOOL "" FORCE) set(WITH_LZMA OFF CACHE BOOL "" FORCE) set(WITH_LZO OFF CACHE BOOL "" FORCE) -set(WITH_MOD_FLUID OFF CACHE BOOL "" FORCE) set(WITH_MOD_REMESH OFF CACHE BOOL "" FORCE) -set(WITH_MOD_SMOKE OFF CACHE BOOL "" FORCE) +set(WITH_MOD_FLUID OFF CACHE BOOL "" FORCE) set(WITH_MOD_OCEANSIM OFF CACHE BOOL "" FORCE) set(WITH_AUDASPACE OFF CACHE BOOL "" FORCE) set(WITH_OPENAL OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 88285e07375..1a610ee45da 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -31,9 +31,8 @@ set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE) set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE) set(WITH_LZMA ON CACHE BOOL "" FORCE) set(WITH_LZO ON CACHE BOOL "" FORCE) -set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE) -set(WITH_MOD_SMOKE ON CACHE BOOL "" FORCE) +set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE) set(WITH_AUDASPACE ON CACHE BOOL "" FORCE) set(WITH_OPENAL ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index a5f79c58ab1..e60760e6cfd 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -411,6 +411,10 @@ if(NOT WITH_TBB OR NOT TBB_FOUND) message(STATUS "TBB not found, disabling OpenVDB") set(WITH_OPENVDB OFF) endif() + if(WITH_MOD_FLUID) + message(STATUS "TBB not found, disabling Fluid modifier") + set(WITH_MOD_FLUID OFF) + endif() endif() # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index b1d1942598d..c3d9b551926 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -567,6 +567,10 @@ else() message(STATUS "TBB disabled, also disabling OpenVDB") set(WITH_OPENVDB OFF) endif() + if(WITH_MOD_FLUID) + message(STATUS "TBB disabled, disabling Fluid modifier") + set(WITH_MOD_FLUID OFF) + endif() endif() # used in many places so include globally, like OpenGL |