diff options
Diffstat (limited to 'build_files/cmake')
| -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/macros.cmake | 5 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 7 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 8 |
6 files changed, 23 insertions, 6 deletions
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index fae15ea979b..5c7a9517c7d 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_MANTA 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..7a54a4dd995 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_MANTA 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 07d95a84112..72d56eb21f2 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_MANTA 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/macros.cmake b/build_files/cmake/macros.cmake index 3944a8b3c56..e2b07227366 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -494,6 +494,11 @@ function(setup_liblinks if(WITH_ALEMBIC) target_link_libraries(${target} ${ALEMBIC_LIBRARIES} ${HDF5_LIBRARIES}) endif() + if(WITH_MOD_MANTA) + if(NOT WITH_OPENMP OR NOT WITH_MANTA_OMP) + target_link_libraries(${target} ${TBB_LIBRARIES}) + endif() + endif() if(WITH_IMAGE_TIFF) target_link_libraries(${target} ${TIFF_LIBRARY}) endif() diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 578ad143d59..e3523fb9945 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -427,6 +427,13 @@ if(WITH_OPENMP) endif() endif() +if(WITH_MOD_MANTA) + if(NOT WITH_OPENMP OR NOT WITH_MANTA_OMP) + set(TBB_INCLUDE_DIRS ${LIBDIR}/tbb/include) + set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a) + endif() +endif() + set(EXETYPE MACOSX_BUNDLE) set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g") diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 9061e1fcf82..7e759aeccb0 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -567,6 +567,14 @@ else() message(STATUS "TBB disabled, also disabling OpenVDB") set(WITH_OPENVDB OFF) endif() + if(WITH_MOD_MANTA) + message(STATUS "TBB disabled, using OpenMP for Mantaflow") + if(NOT WITH_OPENMP) + message(STATUS "OpenMP disabled, also disabling Mantaflow") + else() + set(WITH_MANTA_OMP ON) + endif() + endif() endif() # used in many places so include globally, like OpenGL |