From 12aa9b21087f874fa4ec82e0582bfa80e6344fd5 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 17 Apr 2019 07:58:48 -0600 Subject: 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. --- tests/gtests/alembic/CMakeLists.txt | 2 ++ tests/gtests/bmesh/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tests/gtests') 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 ) -- cgit v1.2.3