diff options
| author | Werner, Stefan <stefan.werner@intel.com> | 2022-05-10 10:05:25 +0300 |
|---|---|---|
| committer | Werner, Stefan <stefan.werner@intel.com> | 2022-05-10 10:05:25 +0300 |
| commit | 2f1843401cb9e8a0a77d80daa6cb6a8b87e5ffeb (patch) | |
| tree | df49a0e83f530ee62a43fd8f5cf266546df06fd4 /CMakeLists.txt | |
| parent | 7cb48199fd17f5b8c69289c8b078a85995780803 (diff) | |
| parent | 08a39d32a988347d2e2ff42a4afa2f8ca9977467 (diff) | |
Merge branch 'master' into cycles_oneapi
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fe95f4b4b1..29ca9caa4b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -504,7 +504,7 @@ if((UNIX AND NOT APPLE) OR (CMAKE_GENERATOR MATCHES "^Visual Studio.+")) endif() option(WITH_BOOST "Enable features depending on boost" ON) -option(WITH_TBB "Enable features depending on TBB (OpenVDB, OpenImageDenoise, sculpt multithreading)" ON) +option(WITH_TBB "Enable multithreading. TBB is also required for features such as Cycles, OpenVDB and USD" ON) # TBB malloc is only supported on for windows currently if(WIN32) @@ -1557,7 +1557,6 @@ endif() if(CMAKE_COMPILER_IS_GNUCC) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) - ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_CAST_ALIGN -Wcast-align) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_VLA -Werror=vla) |