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:
Diffstat (limited to 'build_files/cmake/platform')
-rw-r--r--build_files/cmake/platform/platform_apple.cmake15
-rw-r--r--build_files/cmake/platform/platform_unix.cmake11
-rw-r--r--build_files/cmake/platform/platform_win32.cmake13
3 files changed, 0 insertions, 39 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index a4de3876243..b231a2b6fa4 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -398,21 +398,6 @@ if(WITH_TBB)
find_package(TBB)
endif()
-if(NOT WITH_TBB OR NOT TBB_FOUND)
- if(WITH_OPENIMAGEDENOISE)
- message(STATUS "TBB not found, disabling OpenImageDenoise")
- set(WITH_OPENIMAGEDENOISE OFF)
- endif()
- if(WITH_OPENVDB)
- 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.
if(WITH_OPENMP)
if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 2f9f39b46d9..91f836d5265 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -448,17 +448,6 @@ if(WITH_TBB)
find_package_wrapper(TBB)
endif()
-if(NOT WITH_TBB OR NOT TBB_FOUND)
- if(WITH_OPENIMAGEDENOISE)
- message(STATUS "TBB not found, disabling OpenImageDenoise")
- set(WITH_OPENIMAGEDENOISE OFF)
- endif()
- if(WITH_OPENVDB)
- message(STATUS "TBB not found, disabling OpenVDB")
- set(WITH_OPENVDB OFF)
- endif()
-endif()
-
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
if(HAIKU)
list(APPEND PLATFORM_LINKLIBS -lnetwork)
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 04e5848dcfe..4241f307abc 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -570,19 +570,6 @@ if(WITH_TBB)
if(WITH_TBB_MALLOC_PROXY)
add_definitions(-DWITH_TBB_MALLOC)
endif()
-else()
- if(WITH_OPENIMAGEDENOISE)
- message(STATUS "TBB disabled, also disabling OpenImageDenoise")
- set(WITH_OPENIMAGEDENOISE OFF)
- endif()
- if(WITH_OPENVDB)
- 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