diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-24 14:47:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-24 14:47:35 +0300 |
| commit | 18343c230d2c447f61fb60994b107f6a1adc01e7 (patch) | |
| tree | 14c69008df14feb2b4179cc5e5fac5cf86316e1c /source/creator | |
| parent | 71d53ab4654c3abb9bd548b324f8c9ca34250a9b (diff) | |
Fix/workaround initialization order of static TBB/MKL
Was caused by recent refactor of dependencies in 517870a4a11f.
While there is no fully reliable solution to this issue other than
making TBB a dynamic library dependency (as documentation tells us
to do), there seems to be simple workaround which doesn't require
deeper changed in build process and packaging.
Tested on Brecht's computer who managed to reproduce the issue on
Linux (T72015#857423).
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 ) |