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/intern
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-12-28 00:38:22 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-12-28 00:40:08 +0300
commitcd36f546114fb3c2608f902487eab4a393245b9a (patch)
treecc47cd163d459337164c60e90c2fbdd83b3aef3a /intern
parent4a0063664ec7217548182b7527839c1ac2e8fc23 (diff)
Fix (unreported) broken Cycles tests after numaapi changes today.
Please always build tests when messing with build system/libs, am tired of fixing that kind of issues... Also, that fix is probably not working for standalone, no idea where's the numaapi lib then, but committing since I need a building blender here (with the tests, yes).
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/test/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index 61605535e62..f22992ad79f 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -98,8 +98,8 @@ link_directories(${OPENIMAGEIO_LIBPATH}
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")
-CYCLES_TEST(render_graph_finalize "${ALL_CYCLES_LIBRARIES}")
+CYCLES_TEST(render_graph_finalize "${ALL_CYCLES_LIBRARIES};bf_intern_numaapi")
CYCLES_TEST(util_aligned_malloc "cycles_util")
CYCLES_TEST(util_path "cycles_util;${BOOST_LIBRARIES};${OPENIMAGEIO_LIBRARIES}")
CYCLES_TEST(util_string "cycles_util;${BOOST_LIBRARIES}")
-CYCLES_TEST(util_task "cycles_util;${BOOST_LIBRARIES}")
+CYCLES_TEST(util_task "cycles_util;${BOOST_LIBRARIES};bf_intern_numaapi")