[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60327] branches/soc-2013-viewport_fx/ source/blender/gpu/CMakeLists.txt: Used the 'source_group' feature in CMake to organize the GPU source files better in Visual Studio

Jason Wilkins Jason.A.Wilkins at gmail.com
Mon Sep 23 13:49:42 CEST 2013


Revision: 60327
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60327
Author:   jwilkins
Date:     2013-09-23 11:49:42 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
Used the 'source_group' feature in CMake to organize the GPU source files better in Visual Studio

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt	2013-09-23 08:57:46 UTC (rev 60326)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt	2013-09-23 11:49:42 UTC (rev 60327)
@@ -44,6 +44,50 @@
 	${GLEW_INCLUDE_PATH}
 )
 
+set(INTERN_INC
+	intern/gpu_aspect_intern.h
+	intern/gpu_basic_intern.h
+	intern/gpu_blender_aspect_intern.h
+	intern/gpu_codegen.h
+	intern/gpu_extensions_intern.h
+	intern/gpu_immediate_intern.h
+	intern/gpu_lighting_intern.h
+	intern/gpu_pixels_intern.h
+	intern/gpu_primitives_inline.h
+	intern/gpu_profile.h
+	intern/gpu_raster_intern.h
+	intern/gpu_sprite_intern.h
+)
+
+set(GLSL_SRC
+    shaders/gpu_shader_vertex.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_vsm_store_frag.glsl
+    shaders/gpu_shader_vsm_store_vert.glsl
+
+    shaders/gpu_shader_common_attribs.glsl
+    shaders/gpu_shader_common_constants.glsl
+    shaders/gpu_shader_common_uniforms.glsl
+
+    shaders/gpu_shader_font_frag.glsl
+    shaders/gpu_shader_font_vert.glsl
+
+    shaders/gpu_shader_pixels_uniforms.glsl
+    shaders/gpu_shader_pixels_frag.glsl
+    shaders/gpu_shader_pixels_vert.glsl
+
+    shaders/gpu_shader_basic_frag.glsl
+    shaders/gpu_shader_basic_vert.glsl
+
+    shaders/gpu_shader_raster_frag.glsl
+    shaders/gpu_shader_raster_uniforms.glsl
+    shaders/gpu_shader_raster_vert.glsl
+)
+
 set(SRC
 	intern/gpu_aspect.c
 	intern/gpu_basic.c
@@ -93,18 +137,9 @@
 	GPU_state_latch.h
 	GPU_utility.h
 
-	intern/gpu_aspect_intern.h
-	intern/gpu_basic_intern.h
-	intern/gpu_blender_aspect_intern.h
-	intern/gpu_codegen.h
-	intern/gpu_extensions_intern.h
-	intern/gpu_immediate_intern.h
-	intern/gpu_lighting_intern.h
-	intern/gpu_pixels_intern.h
-	intern/gpu_primitives_inline.h
-	intern/gpu_profile.h
-	intern/gpu_raster_intern.h
-	intern/gpu_sprite_intern.h
+    ${INTERN_INC}
+    
+    ${GLSL_SRC}
 )
 
 if(WITH_GPU_SAFETY)
@@ -113,33 +148,15 @@
 	)
 endif()
 
-data_to_c_simple(shaders/gpu_shader_vertex.glsl   SRC)
-data_to_c_simple(shaders/gpu_shader_material.glsl SRC)
+foreach(GLSL_FILE ${GLSL_SRC})
+    data_to_c_simple(${GLSL_FILE} SRC)
+    list(APPEND GEN_SRC "${CMAKE_CURRENT_BINARY_DIR}/${GLSL_FILE}.c")
+endforeach()
 
-data_to_c_simple(shaders/gpu_shader_sep_gaussian_blur_frag.glsl SRC)
-data_to_c_simple(shaders/gpu_shader_sep_gaussian_blur_vert.glsl SRC)
+source_group("Internal Header Files" FILES ${INTERN_INC})
+source_group("Generated Files"       FILES ${GEN_SRC})
+source_group("Shader Files"          FILES ${GLSL_SRC})
 
-data_to_c_simple(shaders/gpu_shader_vsm_store_frag.glsl SRC)
-data_to_c_simple(shaders/gpu_shader_vsm_store_vert.glsl SRC)
-
-data_to_c_simple(shaders/gpu_shader_common_attribs.glsl   SRC)
-data_to_c_simple(shaders/gpu_shader_common_constants.glsl SRC)
-data_to_c_simple(shaders/gpu_shader_common_uniforms.glsl  SRC)
-
-data_to_c_simple(shaders/gpu_shader_font_frag.glsl SRC)
-data_to_c_simple(shaders/gpu_shader_font_vert.glsl SRC)
-
-data_to_c_simple(shaders/gpu_shader_pixels_uniforms.glsl SRC)
-data_to_c_simple(shaders/gpu_shader_pixels_frag.glsl     SRC)
-data_to_c_simple(shaders/gpu_shader_pixels_vert.glsl     SRC)
-
-data_to_c_simple(shaders/gpu_shader_basic_frag.glsl SRC)
-data_to_c_simple(shaders/gpu_shader_basic_vert.glsl SRC)
-
-data_to_c_simple(shaders/gpu_shader_raster_frag.glsl     SRC)
-data_to_c_simple(shaders/gpu_shader_raster_uniforms.glsl SRC)
-data_to_c_simple(shaders/gpu_shader_raster_vert.glsl     SRC)
-
 if(WITH_MOD_SMOKE)
 	add_definitions(-DWITH_SMOKE)
 endif()




More information about the Bf-blender-cvs mailing list