[Bf-blender-cvs] [bd2b50dfa88] master: Cleanup: sort cmake file lists

Campbell Barton noreply at git.blender.org
Wed Sep 7 07:16:14 CEST 2022


Commit: bd2b50dfa8880c5d525a9940ab18c7f26b266bf9
Author: Campbell Barton
Date:   Wed Sep 7 15:14:33 2022 +1000
Branches: master
https://developer.blender.org/rBbd2b50dfa8880c5d525a9940ab18c7f26b266bf9

Cleanup: sort cmake file lists

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

M	intern/ghost/CMakeLists.txt
M	source/blender/compositor/realtime_compositor/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/gpu/CMakeLists.txt
M	source/blender/nodes/shader/CMakeLists.txt

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

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index f2e6609a263..aa23618ca39 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -299,8 +299,8 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
 
       intern/GHOST_SystemWayland.h
       intern/GHOST_WaylandCursorSettings.h
-      intern/GHOST_WindowWayland.h
       intern/GHOST_WaylandUtils.h
+      intern/GHOST_WindowWayland.h
     )
 
     set(INC_DST ${CMAKE_CURRENT_BINARY_DIR}/libwayland)
diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt
index 9fe156c3ef2..1f1333332f5 100644
--- a/source/blender/compositor/realtime_compositor/CMakeLists.txt
+++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt
@@ -2,13 +2,13 @@
 
 set(INC
   .
+  ../../blenkernel
+  ../../blenlib
   ../../gpu
-  ../../nodes
   ../../imbuf
-  ../../blenlib
   ../../makesdna
   ../../makesrna
-  ../../blenkernel
+  ../../nodes
   ../../gpu/intern
   ../../../../intern/guardedalloc
 )
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index f0c0a435e2a..e6565fc314a 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -86,14 +86,14 @@ set(SRC
   intern/draw_fluid.c
   intern/draw_hair.cc
   intern/draw_instance_data.c
+  intern/draw_manager.c
+  intern/draw_manager.cc
   intern/draw_manager_data.c
   intern/draw_manager_exec.c
   intern/draw_manager_profiling.c
   intern/draw_manager_shader.c
   intern/draw_manager_text.c
   intern/draw_manager_texture.c
-  intern/draw_manager.c
-  intern/draw_manager.cc
   intern/draw_select_buffer.c
   intern/draw_shader.cc
   intern/draw_texture_pool.cc
@@ -138,10 +138,10 @@ set(SRC
   engines/eevee_next/eevee_depth_of_field.cc
   engines/eevee_next/eevee_engine.cc
   engines/eevee_next/eevee_film.cc
+  engines/eevee_next/eevee_hizbuffer.cc
   engines/eevee_next/eevee_instance.cc
   engines/eevee_next/eevee_light.cc
   engines/eevee_next/eevee_material.cc
-  engines/eevee_next/eevee_hizbuffer.cc
   engines/eevee_next/eevee_motion_blur.cc
   engines/eevee_next/eevee_pipeline.cc
   engines/eevee_next/eevee_renderbuffers.cc
@@ -208,34 +208,34 @@ set(SRC
   intern/DRW_gpu_wrapper.hh
   intern/DRW_render.h
   intern/draw_attributes.h
+  intern/draw_cache.h
   intern/draw_cache_extract.hh
   intern/draw_cache_impl.h
   intern/draw_cache_inline.h
-  intern/draw_cache.h
   intern/draw_color_management.h
   intern/draw_command.hh
-  intern/draw_common_shader_shared.h
   intern/draw_common.h
+  intern/draw_common_shader_shared.h
   intern/draw_curves_private.h
   intern/draw_debug.h
   intern/draw_debug.hh
   intern/draw_hair_private.h
   intern/draw_instance_data.h
+  intern/draw_manager.h
+  intern/draw_manager.hh
   intern/draw_manager_profiling.h
   intern/draw_manager_testing.h
   intern/draw_manager_text.h
-  intern/draw_manager.h
-  intern/draw_manager.hh
   intern/draw_pass.hh
   intern/draw_resource.cc
   intern/draw_resource.hh
-  intern/draw_shader_shared.h
   intern/draw_shader.h
+  intern/draw_shader_shared.h
   intern/draw_subdivision.h
   intern/draw_texture_pool.h
-  intern/draw_view_data.h
   intern/draw_view.cc
   intern/draw_view.h
+  intern/draw_view_data.h
   intern/mesh_extractors/extract_mesh.hh
   intern/smaa_textures.h
   engines/basic/basic_engine.h
@@ -513,10 +513,10 @@ set(GLSL_SRC
   intern/shaders/draw_resource_finalize_comp.glsl
   intern/shaders/draw_visibility_comp.glsl
 
-  intern/draw_common_shader_shared.h
   intern/draw_command_shared.hh
-  intern/draw_shader_shared.h
+  intern/draw_common_shader_shared.h
   intern/draw_defines.h
+  intern/draw_shader_shared.h
 
   engines/gpencil/shaders/gpencil_frag.glsl
   engines/gpencil/shaders/gpencil_vert.glsl
@@ -720,8 +720,8 @@ add_dependencies(bf_draw bf_dna)
 if(WITH_GTESTS)
   if(WITH_OPENGL_DRAW_TESTS)
     set(TEST_SRC
-      tests/draw_testing.cc
       tests/draw_pass_test.cc
+      tests/draw_testing.cc
       tests/shaders_test.cc
 
       tests/draw_testing.hh
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 25912c6d978..47d4feb7ec9 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -211,13 +211,13 @@ set(METAL_SRC
   metal/mtl_framebuffer.hh
   metal/mtl_index_buffer.hh
   metal/mtl_memory.hh
-  metal/mtl_pso_descriptor_state.hh
   metal/mtl_primitive.hh
+  metal/mtl_pso_descriptor_state.hh
   metal/mtl_query.hh
   metal/mtl_shader.hh
   metal/mtl_shader_generator.hh
-  metal/mtl_shader_interface_type.hh
   metal/mtl_shader_interface.hh
+  metal/mtl_shader_interface_type.hh
   metal/mtl_shader_shared.h
   metal/mtl_state.hh
   metal/mtl_texture.hh
diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
index d135f9a12a4..7885ad78225 100644
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -67,8 +67,8 @@ set(SRC
   nodes/node_shader_map_range.cc
   nodes/node_shader_mapping.cc
   nodes/node_shader_math.cc
-  nodes/node_shader_mix_rgb.cc
   nodes/node_shader_mix.cc
+  nodes/node_shader_mix_rgb.cc
   nodes/node_shader_mix_shader.cc
   nodes/node_shader_normal.cc
   nodes/node_shader_normal_map.cc



More information about the Bf-blender-cvs mailing list