[Bf-blender-cvs] [57d2d8ac05e] master: CMake: recent removal of linked libs gave errors in some cases
Campbell Barton
noreply at git.blender.org
Wed Dec 11 10:37:17 CET 2019
Commit: 57d2d8ac05ef33afb1875216d13f8465c58c5604
Author: Campbell Barton
Date: Wed Dec 11 20:34:34 2019 +1100
Branches: master
https://developer.blender.org/rB57d2d8ac05ef33afb1875216d13f8465c58c5604
CMake: recent removal of linked libs gave errors in some cases
While I can't redo the error, it looks to be related to tbb & mkldnn.
Adding back in this case for now.
===================================================================
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 01eac349b9c..96ceac5c4d4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -41,6 +41,12 @@ set(LIB
bf_windowmanager
)
+# Note: this should not be needed, but causes issues in some situations:
+# See reply to daf290dcc80c.
+if(WITH_TBB AND WITH_OPENIMAGEDENOISE)
+ list(INSERT LIB 0 bf_blenkernel)
+endif()
+
add_definitions(${GL_DEFINITIONS})
blender_include_dirs("${GLEW_INCLUDE_PATH}")
More information about the Bf-blender-cvs
mailing list