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

Campbell Barton noreply at git.blender.org
Wed Oct 20 00:32:33 CEST 2021


Commit: 967fec68837d3496b994094e5f24775ebcf6f6ce
Author: Campbell Barton
Date:   Wed Oct 20 09:17:46 2021 +1100
Branches: master
https://developer.blender.org/rB967fec68837d3496b994094e5f24775ebcf6f6ce

Cleanup: sort cmake file lists

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

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/draw/CMakeLists.txt
M	source/blender/functions/CMakeLists.txt
M	source/blender/nodes/CMakeLists.txt

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

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index a86c6fbd3dd..ef95d747948 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -472,8 +472,8 @@ set(SRC
   intern/CCGSubSurf.h
   intern/CCGSubSurf_inline.h
   intern/CCGSubSurf_intern.h
-  intern/attribute_access_intern.hh
   intern/asset_library_service.hh
+  intern/attribute_access_intern.hh
   intern/data_transfer_intern.h
   intern/lib_intern.h
   intern/multires_inline.h
@@ -801,8 +801,8 @@ if(WITH_GTESTS)
   set(TEST_SRC
     intern/action_test.cc
     intern/armature_test.cc
-    intern/asset_catalog_test.cc
     intern/asset_catalog_path_test.cc
+    intern/asset_catalog_test.cc
     intern/asset_library_service_test.cc
     intern/asset_library_test.cc
     intern/asset_test.cc
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 62dcf438471..baf83234354 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -94,7 +94,6 @@ set(SRC
   intern/draw_color_management.cc
   intern/draw_common.c
   intern/draw_debug.c
-  intern/draw_view_data.cc
   intern/draw_fluid.c
   intern/draw_hair.c
   intern/draw_instance_data.c
@@ -106,10 +105,11 @@ set(SRC
   intern/draw_manager_text.c
   intern/draw_manager_texture.c
   intern/draw_select_buffer.c
-  intern/draw_texture_pool.cc
   intern/draw_shader.c
-  intern/smaa_textures.c
+  intern/draw_texture_pool.cc
   intern/draw_view.c
+  intern/draw_view_data.cc
+  intern/smaa_textures.c
   engines/basic/basic_engine.c
   engines/image/image_engine.c
   engines/image/image_shader.c
@@ -200,16 +200,16 @@ set(SRC
   intern/draw_color_management.h
   intern/draw_common.h
   intern/draw_debug.h
-  intern/draw_view_data.h
   intern/draw_hair_private.h
   intern/draw_instance_data.h
   intern/draw_manager.h
   intern/draw_manager_profiling.h
   intern/draw_manager_testing.h
   intern/draw_manager_text.h
-  intern/draw_texture_pool.h
   intern/draw_shader.h
+  intern/draw_texture_pool.h
   intern/draw_view.h
+  intern/draw_view_data.h
   intern/mesh_extractors/extract_mesh.h
   intern/smaa_textures.h
   engines/basic/basic_engine.h
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 844e21f5e2c..74625fe2826 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -41,9 +41,9 @@ set(SRC
 
   FN_cpp_type.hh
   FN_cpp_type_make.hh
-  FN_generic_array.hh
   FN_field.hh
   FN_field_cpp_type.hh
+  FN_generic_array.hh
   FN_generic_pointer.hh
   FN_generic_span.hh
   FN_generic_value_map.hh
@@ -88,8 +88,8 @@ blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 if(WITH_GTESTS)
   set(TEST_SRC
     tests/FN_cpp_type_test.cc
-    tests/FN_generic_array_test.cc
     tests/FN_field_test.cc
+    tests/FN_generic_array_test.cc
     tests/FN_generic_span_test.cc
     tests/FN_generic_vector_array_test.cc
     tests/FN_multi_function_procedure_test.cc
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 9cf04ac3aab..39265c13a1f 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -140,10 +140,10 @@ set(SRC
   function/nodes/node_fn_boolean_math.cc
   function/nodes/node_fn_float_compare.cc
   function/nodes/node_fn_float_to_int.cc
+  function/nodes/node_fn_input_color.cc
   function/nodes/node_fn_input_special_characters.cc
   function/nodes/node_fn_input_string.cc
   function/nodes/node_fn_input_vector.cc
-  function/nodes/node_fn_input_color.cc
   function/nodes/node_fn_random_value.cc
   function/nodes/node_fn_replace_string.cc
   function/nodes/node_fn_rotate_euler.cc
@@ -274,6 +274,7 @@ set(SRC
   geometry/nodes/node_geo_set_spline_resolution.cc
   geometry/nodes/node_geo_string_join.cc
   geometry/nodes/node_geo_string_to_curves.cc
+  geometry/nodes/node_geo_subdivision_surface.cc
   geometry/nodes/node_geo_switch.cc
   geometry/nodes/node_geo_transfer_attribute.cc
   geometry/nodes/node_geo_transform.cc
@@ -281,7 +282,6 @@ set(SRC
   geometry/nodes/node_geo_triangulate.cc
   geometry/nodes/node_geo_viewer.cc
   geometry/nodes/node_geo_volume_to_mesh.cc
-  geometry/nodes/node_geo_subdivision_surface.cc
 
   geometry/node_geometry_exec.cc
   geometry/node_geometry_tree.cc



More information about the Bf-blender-cvs mailing list