diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-24 14:49:49 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-24 14:49:49 +0300 |
commit | 11df5443e5d062e5a08714433eed37b9a78c15ba (patch) | |
tree | ed6e2b692a8dba659db40589c560762b9ee92d3f /source/creator | |
parent | cf84db61a6baf160fc3521e5b5a4121609b9ea8d (diff) | |
parent | 18343c230d2c447f61fb60994b107f6a1adc01e7 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index d2af282f9a4..82c45b4fe64 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -38,6 +38,14 @@ blender_include_dirs( ) set(LIB + # This forces TBB libraries to be in front of MKL (which is a part of OpenImageDenoise). + # + # The need of this comes to need to ensure static libraries initialization order, making it + # so TBB is initialized prior to MKL (or any other dpeendnecy). + # + # This isn't fully robust but seems to work. + ${TBB_LIBRARIES} + bf_windowmanager ) |