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:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-01-23 18:59:50 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-01-23 18:59:50 +0300
commit6fff73e3f001840f70850ffd088fa1dcadc0a78a (patch)
treee95159e35e6cd6abd1ed17ca1052242a28fbd0df /tests
parentfb671035be082a67e6ffc58fb098c0d5140ba6b0 (diff)
parent517870a4a11f660c71d3901818fbb09798cb2d7d (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'tests')
-rw-r--r--tests/gtests/alembic/CMakeLists.txt3
-rw-r--r--tests/gtests/blenlib/CMakeLists.txt1
-rw-r--r--tests/gtests/usd/CMakeLists.txt3
3 files changed, 7 insertions, 0 deletions
diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt
index 57b1fb52022..f8b2c373029 100644
--- a/tests/gtests/alembic/CMakeLists.txt
+++ b/tests/gtests/alembic/CMakeLists.txt
@@ -37,6 +37,9 @@ set(LIB
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
+
+ ${OPENEXR_LIBRARIES}
+ ${BOOST_LIBRARIES}
)
include_directories(${INC})
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index 1f52886132f..c6b23615a5a 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -27,6 +27,7 @@ set(INC
../../../intern/atomic
)
+setup_libdirs()
include_directories(${INC})
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
diff --git a/tests/gtests/usd/CMakeLists.txt b/tests/gtests/usd/CMakeLists.txt
index 21bd2aba07f..3850d279b3c 100644
--- a/tests/gtests/usd/CMakeLists.txt
+++ b/tests/gtests/usd/CMakeLists.txt
@@ -52,6 +52,9 @@ set(LIB
bf_gpu
bf_usd
+
+ ${BOOST_LIBRARIES}
+ ${TBB_LIBRARIES}
)
include_directories(${INC})