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
path: root/extern
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2019-12-20 20:50:40 +0300
committerRay Molenkamp <github@lazydodo.com>2019-12-20 20:50:40 +0300
commita2d6dfc026e58446776b8e5fb37b54254e8c76a7 (patch)
tree90eff7a3bfb5de0e51a4747c0f92894240390dcf /extern
parent39112a4f7b2b5e65dd73b13215e9df67f27ab88a (diff)
Fix: Build error with clang on windows.
A bug in llvm < 9.0.1 causes the compiler to crash when openmp is enabled. Since mantaflow uses tbb we can safely disable this flag temporarily for this module. Reviewed By: sebbas Differential Revision: https://developer.blender.org/D6446
Diffstat (limited to 'extern')
-rw-r--r--extern/mantaflow/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/extern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt
index 72ce920c621..f4eefbb4d04 100644
--- a/extern/mantaflow/CMakeLists.txt
+++ b/extern/mantaflow/CMakeLists.txt
@@ -23,6 +23,14 @@
#
# ***** END GPL LICENSE BLOCK *****
+# Mantaflow triggers a clang-cl compiler error with versions before 9.0.1
+# Since mantaflow does not appear to be using OpenMP at this point in time,
+# disable the flag for now. See https://bugs.llvm.org/show_bug.cgi?id=43175 for details.
+
+if(MSVC_CLANG AND WITH_OPENMP AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0.1")
+ remove_cc_flag("-fopenmp")
+endif()
+
set(MANTAVERSION "0.12")
add_definitions(-DWITH_FLUID=1)