Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2019-04-17 16:58:48 +0300
committerRay Molenkamp <github@lazydodo.com>2019-04-17 16:58:48 +0300
commit12aa9b21087f874fa4ec82e0582bfa80e6344fd5 (patch)
treef822829998fa7fd6f03e026107d1f90897402d6b /tests
parentedde48f5784452d3b4cc6eb6242aaf0778830ce3 (diff)
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/gtests/alembic/CMakeLists.txt2
-rw-r--r--tests/gtests/bmesh/CMakeLists.txt2
2 files changed, 4 insertions, 0 deletions
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
)