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:
authorCampbell Barton <ideasman42@gmail.com>2019-12-11 12:34:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-12-11 12:36:57 +0300
commit57d2d8ac05ef33afb1875216d13f8465c58c5604 (patch)
treec90effc5b7ce46a347994a0d1a63c9171e4ca8c7 /source/creator/CMakeLists.txt
parent7f36db35cee4a0c5c6eebd5d7baeacd3dd529983 (diff)
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.
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
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}")