[Bf-blender-cvs] [2264590d8cc] blender-v2.82-release: CMake: Attempt to fix tests on buildbot

Sergey Sharybin noreply at git.blender.org
Tue Feb 4 11:07:49 CET 2020


Commit: 2264590d8cc959a6c05c10e91b20ea818c56ff73
Author: Sergey Sharybin
Date:   Tue Feb 4 11:05:57 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB2264590d8cc959a6c05c10e91b20ea818c56ff73

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.

===================================================================

M	build_files/cmake/Modules/GTestTesting.cmake

===================================================================

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



More information about the Bf-blender-cvs mailing list