diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-02-04 13:05:57 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-02-04 13:05:57 +0300 |
| commit | 2264590d8cc959a6c05c10e91b20ea818c56ff73 (patch) | |
| tree | ed2635f48e37b63a7dbe0e686312509388672ae5 | |
| parent | 057b78c40cf3b79e9cc8a7225d82c0166db693e9 (diff) | |
CMake: Attempt to fix tests on buildbot
An educated guess to put ensure order of static libraries initialization.
A bit weird, since OpenImageDenoise should be depending on TBB, but that
is likely being ensured by bf_compositor.
Linking succeeded on my Intel machine, and blenloader_test was passing
when doing manual test on buildbot.
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index c9f62906ae0..3f3aa4f374b 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -46,6 +46,9 @@ macro(BLENDER_SRC_GTEST_EX) # that it is initialized before MKL and static library initialization order # issues are avoided. target_link_libraries(${TARGET_NAME} ${TBB_LIBRARIES}) + if(WITH_OPENIMAGEDENOISE) + target_link_libraries(${TARGET_NAME} ${OPENIMAGEDENOISE_LIBRARIES}) + endif() endif() target_link_libraries(${TARGET_NAME} bf_testing_main |