From 111179beb0b12cfcc7075935262241c65f04fb84 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 27 Dec 2018 22:38:22 +0100 Subject: [PATCH] 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). --- intern/cycles/test/CMakeLists.txt | 4 ++-- 1 file 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")