From 2264590d8cc959a6c05c10e91b20ea818c56ff73 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 4 Feb 2020 11:05:57 +0100 Subject: 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. --- build_files/cmake/Modules/GTestTesting.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build_files') 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 -- cgit v1.2.3