[Bf-blender-cvs] [12aa9b21087] master: Fix T63678 Link error of tests with MSVC.
Ray Molenkamp
noreply at git.blender.org
Wed Apr 17 15:58:56 CEST 2019
Commit: 12aa9b21087f874fa4ec82e0582bfa80e6344fd5
Author: Ray Molenkamp
Date: Wed Apr 17 07:58:48 2019 -0600
Branches: master
https://developer.blender.org/rB12aa9b21087f874fa4ec82e0582bfa80e6344fd5
Fix T63678 Link error of tests with MSVC.
Ideally OCIO removes their log2 implementation from the global namespace
but for now this linker tweak will have to do.
===================================================================
M tests/gtests/alembic/CMakeLists.txt
M tests/gtests/bmesh/CMakeLists.txt
===================================================================
diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt
index 1eaefe6d91d..57b1fb52022 100644
--- a/tests/gtests/alembic/CMakeLists.txt
+++ b/tests/gtests/alembic/CMakeLists.txt
@@ -34,6 +34,8 @@ set(INC
set(LIB
bf_blenloader # Should not be needed but gives linking error without it.
+ bf_intern_opencolorio # Should not be needed but gives windows linker errors if the ocio libs are linked before this
+ bf_gpu # Should not be needed but gives windows linker errors if the ocio libs are linked before this
bf_alembic
)
diff --git a/tests/gtests/bmesh/CMakeLists.txt b/tests/gtests/bmesh/CMakeLists.txt
index 4093ace9ff4..f9e1c97c405 100644
--- a/tests/gtests/bmesh/CMakeLists.txt
+++ b/tests/gtests/bmesh/CMakeLists.txt
@@ -29,6 +29,8 @@ set(INC
set(LIB
bf_blenloader # Should not be needed but gives linking error without it.
+ bf_intern_opencolorio # Should not be needed but gives windows linker errors if the ocio libs are linked before this
+ bf_gpu # Should not be needed but gives windows linker errors if the ocio libs are linked before this
bf_bmesh
)
More information about the Bf-blender-cvs
mailing list