[Bf-blender-cvs] [1431d9a5457] temp_cryptomatte: Revert moving includes to fix linux linking and just change linkorder again

[Jens Verwiebe]

Commit: 1431d9a5457cbbcb01c4e9254673aeb9799eb051
Author: Jens Verwiebe
Date:   Mon Nov 6 17:32:30 2017 +0100
Branches: temp_cryptomatte
https://developer.blender.org/rB1431d9a5457cbbcb01c4e9254673aeb9799eb051

Revert moving includes to fix linux linking and just change linkorder again

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

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 6998595a6fc..1630ff3d973 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -651,10 +651,10 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_intern_mikktspace
 		bf_intern_dualcon
 		bf_intern_cycles
+		cycles_device
 		cycles_render
 		cycles_graph
 		cycles_bvh
-		cycles_device
 		cycles_kernel
 		cycles_util
 		cycles_subd
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 30b0e7a0da0..959c0aa97c9 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -31,7 +31,6 @@ set(SRC
 	device_opencl.cpp
 	device_split_kernel.cpp
 	device_task.cpp
-	../render/coverage.cpp
 )
 
 set(SRC_OPENCL
@@ -59,7 +58,6 @@ 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 17ac66644e2..ce2344b9c35 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -15,6 +15,7 @@ set(SRC
 	buffers.cpp
 	camera.cpp
 	constant_fold.cpp
+	coverage.cpp
 	film.cpp
 	graph.cpp
 	image.cpp
@@ -44,6 +45,7 @@ set(SRC_HEADERS
 	buffers.h
 	camera.h
 	constant_fold.h
+	coverage.h
 	film.h
 	graph.h
 	image.h