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

Campbell Barton noreply at git.blender.org
Thu Jan 6 04:06:10 CET 2022 

Commit: 66a4da87f4ce9345bf8649b5382041380134adcb
Author: Campbell Barton
Date:   Thu Jan 6 13:54:55 2022 +1100
Branches: master
https://developer.blender.org/rB66a4da87f4ce9345bf8649b5382041380134adcb

Cleanup: sort cmake file lists

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

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenlib/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/editors/interface/CMakeLists.txt
M	source/blender/editors/io/CMakeLists.txt
M	source/blender/editors/space_file/CMakeLists.txt
M	source/blender/io/wavefront_obj/CMakeLists.txt
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/geometry/CMakeLists.txt
M	source/blender/nodes/shader/CMakeLists.txt

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

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 3c780a933d3..4449a1bce62 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -227,7 +227,6 @@ set(SRC
   intern/nla.c
   intern/node.cc
   intern/node_tree_update.cc
-  intern/type_conversions.cc
   intern/object.cc
   intern/object_deform.c
   intern/object_dupli.cc
@@ -290,6 +289,7 @@ set(SRC
   intern/tracking_solver.c
   intern/tracking_stabilize.c
   intern/tracking_util.c
+  intern/type_conversions.cc
   intern/undo_system.c
   intern/unit.c
   intern/vfont.c
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 516d9d2fe84..0db0d9a67b3 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -127,8 +127,8 @@ set(SRC
   intern/resource_scope.cc
   intern/scanfill.c
   intern/scanfill_utils.c
-  intern/session_uuid.c
   intern/serialize.cc
+  intern/session_uuid.c
   intern/smallhash.c
   intern/sort.c
   intern/sort_utils.c
@@ -284,10 +284,10 @@ set(SRC
   BLI_rect.h
   BLI_resource_scope.hh
   BLI_scanfill.h
+  BLI_serialize.hh
   BLI_session_uuid.h
   BLI_set.hh
   BLI_set_slots.hh
-  BLI_serialize.hh
   BLI_simd.h
   BLI_smallhash.h
   BLI_sort.h
@@ -423,8 +423,8 @@ if(WITH_GTESTS)
     tests/BLI_disjoint_set_test.cc
     tests/BLI_edgehash_test.cc
     tests/BLI_expr_pylike_eval_test.cc
-    tests/BLI_function_ref_test.cc
     tests/BLI_fileops_test.cc
+    tests/BLI_function_ref_test.cc
     tests/BLI_ghash_test.cc
     tests/BLI_hash_mm2a_test.cc
     tests/BLI_heap_simple_test.cc
@@ -455,12 +455,12 @@ if(WITH_GTESTS)
     tests/BLI_path_util_test.cc
     tests/BLI_polyfill_2d_test.cc
     tests/BLI_ressource_strings.h
+    tests/BLI_serialize_test.cc
     tests/BLI_session_uuid_test.cc
     tests/BLI_set_test.cc
     tests/BLI_span_test.cc
     tests/BLI_stack_cxx_test.cc
     tests/BLI_stack_test.cc
-    tests/BLI_serialize_test.cc
     tests/BLI_string_ref_test.cc
     tests/BLI_string_search_test.cc
     tests/BLI_string_test.cc
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index b0e0702f50a..2a243eb9202 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -225,9 +225,9 @@ set(SRC
   engines/eevee/eevee_lut.h
   engines/eevee/eevee_private.h
   engines/external/external_engine.h
+  engines/image/image_drawing_mode_image_space.hh
   engines/image/image_engine.h
   engines/image/image_private.hh
-  engines/image/image_drawing_mode_image_space.hh
   engines/image/image_space_image.hh
   engines/image/image_space_node.hh
   engines/workbench/workbench_engine.h
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index bc3075f9de8..95c9f7cc8b2 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -24,8 +24,8 @@ set(INC
   ../../blentranslation
   ../../depsgraph
   ../../draw
-  ../../gpu
   ../../functions
+  ../../gpu
   ../../imbuf
   ../../makesdna
   ../../makesrna
@@ -71,8 +71,8 @@ set(SRC
   interface_regions.c
   interface_style.c
   interface_template_asset_view.cc
-  interface_template_list.cc
   interface_template_attribute_search.cc
+  interface_template_list.cc
   interface_template_search_menu.cc
   interface_template_search_operator.c
   interface_templates.c
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index 83cdba4e54b..cb1c3cedf8e 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -25,8 +25,8 @@ set(INC
   ../../io/alembic
   ../../io/collada
   ../../io/gpencil
-  ../../io/wavefront_obj
   ../../io/usd
+  ../../io/wavefront_obj
   ../../makesdna
   ../../makesrna
   ../../windowmanager
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index 1651269869e..cbeb2e6f529 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -16,8 +16,8 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-  ../include
   ../asset
+  ../include
   ../../blenfont
   ../../blenkernel
   ../../blenlib
diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 190475c5550..296dd70b5a2 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -37,19 +37,19 @@ set(INC_SYS
 
 set(SRC
   IO_wavefront_obj.cc
-  exporter/obj_exporter.cc
   exporter/obj_export_file_writer.cc
   exporter/obj_export_mesh.cc
   exporter/obj_export_mtl.cc
   exporter/obj_export_nurbs.cc
+  exporter/obj_exporter.cc
 
   IO_wavefront_obj.h
-  exporter/obj_exporter.hh
   exporter/obj_export_file_writer.hh
   exporter/obj_export_io.hh
   exporter/obj_export_mesh.hh
   exporter/obj_export_mtl.hh
   exporter/obj_export_nurbs.hh
+  exporter/obj_exporter.hh
 )
 
 set(LIB
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 56934596cc7..e210958fa5d 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -87,9 +87,9 @@ set(SRC
   intern/node_multi_function.cc
   intern/node_socket.cc
   intern/node_socket_declarations.cc
-  intern/socket_search_link.cc
   intern/node_tree_ref.cc
   intern/node_util.c
+  intern/socket_search_link.cc
 
   texture/node_texture_util.h
 
@@ -107,8 +107,8 @@ set(SRC
   NOD_shader.h
   NOD_socket.h
   NOD_socket_declarations.hh
-  NOD_socket_search_link.hh
   NOD_socket_declarations_geometry.hh
+  NOD_socket_search_link.hh
   NOD_static_types.h
   NOD_texture.h
   intern/node_common.h
diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt
index 15e6544903f..d692bd050c8 100644
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -122,8 +122,8 @@ set(SRC
   nodes/node_geo_input_curve_tilt.cc
   nodes/node_geo_input_id.cc
   nodes/node_geo_input_index.cc
-  nodes/node_geo_input_material_index.cc
   nodes/node_geo_input_material.cc
+  nodes/node_geo_input_material_index.cc
   nodes/node_geo_input_mesh_edge_angle.cc
   nodes/node_geo_input_mesh_edge_neighbors.cc
   nodes/node_geo_input_mesh_edge_vertices.cc
@@ -171,8 +171,8 @@ set(SRC
   nodes/node_geo_set_curve_radius.cc
   nodes/node_geo_set_curve_tilt.cc
   nodes/node_geo_set_id.cc
-  nodes/node_geo_set_material_index.cc
   nodes/node_geo_set_material.cc
+  nodes/node_geo_set_material_index.cc
   nodes/node_geo_set_point_radius.cc
   nodes/node_geo_set_position.cc
   nodes/node_geo_set_shade_smooth.cc
diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
index ae1a7115b95..4cf18429e0d 100644
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -93,8 +93,8 @@ set(SRC
   nodes/node_shader_output_material.cc
   nodes/node_shader_output_world.cc
   nodes/node_shader_particle_info.cc
-  nodes/node_shader_rgb_to_bw.cc
   nodes/node_shader_rgb.cc
+  nodes/node_shader_rgb_to_bw.cc
   nodes/node_shader_script.cc
   nodes/node_shader_sepcomb_hsv.cc
   nodes/node_shader_sepcomb_rgb.cc

More information about the Bf-blender-cvs mailing list