[Bf-blender-cvs] [df816d534f1] master: Fix cmake not triggering rebuild on .glsl changes

[Dalai Felinto]

Commit: df816d534f195b9a38383e8b0dd806d0586a6fc0
Author: Dalai Felinto
Date:   Tue Oct 16 16:54:59 2018 -0300
Branches: master
https://developer.blender.org/rBdf816d534f195b9a38383e8b0dd806d0586a6fc0

Fix cmake not triggering rebuild on .glsl changes

At least on windows we do not re-run datatoc when the .glsl files change.

To test is simple, just change edit_mesh_overlay_common_lib.glsl
remove lines, write plain text, ..., now rebuild and go in edit mode
with the default cube.

I also had to remove the entry in gpu/CMakeLists.txt for
gpu_shader_material.glsl since this was being tracked directly, as well
as running data_to_c_simple (otherwise CMake raises an error for
duplicated entries).

We probably want to do the same for the other datatoc functions.

Reviewers: LazyDodo, brecht
Differential Revision: https://developer.blender.org/D3803

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

M	build_files/cmake/macros.cmake
M	source/blender/gpu/CMakeLists.txt

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index be24de94c7b..d6ddb26e293 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1232,6 +1232,8 @@ function(data_to_c_simple
 	get_filename_component(_file_to   ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH)
 
 	list(APPEND ${list_to_add} ${_file_to})
+	source_group(Generated FILES ${_file_to})
+	list(APPEND ${list_to_add} ${file_from})
 	set(${list_to_add} ${${list_to_add}} PARENT_SCOPE)
 
 	get_filename_component(_file_to_path ${_file_to} PATH)
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 0fde0e2a4a9..31cf2033714 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -62,28 +62,6 @@ set(SRC
 	intern/gpu_shader.c
 	intern/gpu_texture.c
 
-	shaders/gpu_shader_fx_lib.glsl
-	shaders/gpu_shader_fx_ssao_frag.glsl
-	shaders/gpu_shader_fx_dof_frag.glsl
-	shaders/gpu_shader_fx_dof_vert.glsl
-	shaders/gpu_shader_fx_dof_hq_frag.glsl
-	shaders/gpu_shader_fx_dof_hq_vert.glsl
-	shaders/gpu_shader_fx_dof_hq_geo.glsl
-	shaders/gpu_shader_fx_vert.glsl
-	shaders/gpu_shader_material.glsl
-	shaders/gpu_shader_sep_gaussian_blur_frag.glsl
-	shaders/gpu_shader_sep_gaussian_blur_vert.glsl
-	shaders/gpu_shader_basic_frag.glsl
-	shaders/gpu_shader_basic_vert.glsl
-	shaders/gpu_shader_basic_geom.glsl
-	shaders/gpu_shader_vertex.glsl
-	shaders/gpu_shader_vsm_store_frag.glsl
-	shaders/gpu_shader_vsm_store_vert.glsl
-	shaders/gpu_shader_fx_depth_resolve.glsl
-	shaders/gpu_shader_fire_frag.glsl
-	shaders/gpu_shader_smoke_frag.glsl
-	shaders/gpu_shader_smoke_vert.glsl
-
 	GPU_basic_shader.h
 	GPU_buffers.h
 	GPU_compositing.h