Commit: cd36f546114fb3c2608f902487eab4a393245b9a
Author: Bastien Montagne
Date: Thu Dec 27 22:38:22 2018 +0100
Branches: master
https://developer.blender.org/rBcd36f546114fb3c2608f902487eab4a393245b9a
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).
===================================================================
M intern/cycles/test/CMakeLists.txt
===================================================================
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")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
