[Bf-blender-cvs] [1dd33b2f23f] master: Cycles: Fix test compilation failure after recent refactor

[Sergey Sharybin]

Commit: 1dd33b2f23f0385bfd8dde78250aafd561191430
Author: Sergey Sharybin
Date:   Tue Oct 24 10:47:02 2017 +0200
Branches: master
https://developer.blender.org/rB1dd33b2f23f0385bfd8dde78250aafd561191430

Cycles: Fix test compilation failure after recent refactor

The test will leak CPU devices, but is all passing other than that.
Leak will be fixed shortly.

P.S. Committing code refactor without running regression tests, tsk ;)

===================================================================

M	intern/cycles/test/CMakeLists.txt
M	intern/cycles/test/render_graph_finalize_test.cpp

===================================================================

diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index 80564c33be6..f4213c508fc 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -22,12 +22,17 @@ set(INC
 )
 
 set(ALL_CYCLES_LIBRARIES
-	cycles_render
 	cycles_device
+	cycles_kernel
+	cycles_render
 	cycles_bvh
 	cycles_graph
 	cycles_subd
 	cycles_util
+	extern_clew
+	${BLENDER_GL_LIBRARIES}
+	${BLENDER_GLEW_LIBRARIES}
+	${CYCLES_APP_GLEW_LIBRARY}
 	${OPENIMAGEIO_LIBRARIES}
 )
 if(WITH_CYCLES_OSL)
@@ -52,6 +57,15 @@ if(WITH_CYCLES_OPENSUBDIV)
 		${OPENSUBDIV_LIBRARIES}
 	)
 endif()
+if(WITH_CUDA_DYNLOAD)
+	list(APPEND ALL_CYCLES_LIBRARIES extern_cuew)
+else()
+	list(APPEND ALL_CYCLES_LIBRARIES ${CUDA_CUDA_LIBRARY})
+endif()
+if(NOT CYCLES_STANDALONE_REPOSITORY)
+	list(APPEND ALL_CYCLES_LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc ${GLEW_LIBRARY})
+endif()
+
 list(APPEND ALL_CYCLES_LIBRARIES
 	${BOOST_LIBRARIES}
 	${PNG_LIBRARIES}
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp
index 3fc086cbc0c..fc78bda6df3 100644
--- a/intern/cycles/test/render_graph_finalize_test.cpp
+++ b/intern/cycles/test/render_graph_finalize_test.cpp
@@ -160,8 +160,10 @@ protected:
 	util_logging_verbosity_set(1); \
 	ScopedMockLog mock_log_name; \
 	DeviceInfo device_info; \
+	Stats stats; \
+	Device *device_cpu = Device::create(device_info, stats, true); \
 	SceneParams scene_params; \
-	Scene scene(scene_params, device_info); \
+	Scene scene(scene_params, device_cpu); \
 	ShaderGraph graph; \
 	ShaderGraphBuilder builder(&graph); \