[Bf-blender-cvs] [bd081133bed] temp_cryptomatte: Build coverage into cyles_device to fix linux linking finally, TODO: move files eventually

[Jens Verwiebe]

Commit: bd081133bed9bca12fb6db74b55c8bf7a8a9ee75
Author: Jens Verwiebe
Date:   Sat Nov 4 17:36:00 2017 +0100
Branches: temp_cryptomatte
https://developer.blender.org/rBbd081133bed9bca12fb6db74b55c8bf7a8a9ee75

Build coverage into cyles_device to fix linux linking finally, TODO: move files eventually

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

M	build_files/cmake/macros.cmake
M	intern/cycles/device/CMakeLists.txt
M	intern/cycles/render/CMakeLists.txt

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index c3842ef5426..6998595a6fc 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -668,11 +668,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_intern_glew_mx
 	)
 
-	# tenative fix for linux missing flatten_coverage symbol cause of contradictionary ordering
-	if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-		list(APPEND BLENDER_SORTED_LIBS cycles_render)
-	endif()
-
 	if(NOT WITH_SYSTEM_GLOG)
 		list(APPEND BLENDER_SORTED_LIBS extern_glog)
 	endif()
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 959c0aa97c9..30b0e7a0da0 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -31,6 +31,7 @@ set(SRC
 	device_opencl.cpp
 	device_split_kernel.cpp
 	device_task.cpp
+	../render/coverage.cpp
 )
 
 set(SRC_OPENCL
@@ -58,6 +59,7 @@ set(SRC_HEADERS
 	device_network.h
 	device_split_kernel.h
 	device_task.h
+	../render/coverage.h
 )
 
 add_definitions(${GL_DEFINITIONS})
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index ce2344b9c35..17ac66644e2 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
 	buffers.cpp
 	camera.cpp
 	constant_fold.cpp
-	coverage.cpp
 	film.cpp
 	graph.cpp
 	image.cpp
@@ -45,7 +44,6 @@ set(SRC_HEADERS
 	buffers.h
 	camera.h
 	constant_fold.h
-	coverage.h
 	film.h
 	graph.h
 	image.h