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

Campbell Barton noreply at git.blender.org
Fri Dec 11 05:33:01 CET 2020 

Commit: 392a8e2907ee1c08813258c1a477bbea060ba06d
Author: Campbell Barton
Date:   Fri Dec 11 15:00:22 2020 +1100
Branches: master
https://developer.blender.org/rB392a8e2907ee1c08813258c1a477bbea060ba06d

Cleanup: sort cmake file lists

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

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/editors/object/CMakeLists.txt
M	source/blender/editors/space_graph/CMakeLists.txt
M	source/blender/editors/space_node/CMakeLists.txt
M	source/blender/editors/space_outliner/CMakeLists.txt
M	source/blender/editors/space_view3d/CMakeLists.txt
M	source/blender/editors/transform/CMakeLists.txt
M	source/blender/editors/uvedit/CMakeLists.txt
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/nodes/CMakeLists.txt
M	source/blender/render/CMakeLists.txt
M	source/blender/sequencer/CMakeLists.txt
M	source/creator/CMakeLists.txt

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

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c962f0a6a8c..65161317351 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -36,10 +36,10 @@ set(INC
   ../makesrna
   ../modifiers
   ../nodes
+  ../render
   ../sequencer
   ../shader_fx
   ../simulation
-  ../render
   ../../../intern/ghost
   ../../../intern/glew-mx
   ../../../intern/guardedalloc
@@ -726,8 +726,8 @@ if(WITH_GTESTS)
     intern/armature_test.cc
     intern/fcurve_test.cc
     intern/lattice_deform_test.cc
-    intern/tracking_test.cc
     intern/layer_test.cc
+    intern/tracking_test.cc
   )
   set(TEST_INC
     ../editors/include
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index a1be9b9df61..d872511ae03 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -31,8 +31,8 @@ set(INC
   ../../makesrna
   ../../modifiers
   ../../python
-  ../../shader_fx
   ../../render
+  ../../shader_fx
   ../../windowmanager
   ../../../../intern/clog
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index 414e5c87f5a..2a795dd954c 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -34,8 +34,8 @@ set(SRC
   graph_draw.c
   graph_edit.c
   graph_ops.c
-  graph_slider_ops.c
   graph_select.c
+  graph_slider_ops.c
   graph_utils.c
   graph_view.c
   space_graph.c
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index d8f31161c20..f4a3bb96aeb 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -21,6 +21,7 @@ set(INC
   ../../blenkernel
   ../../blenlib
   ../../blentranslation
+  ../../compositor
   ../../depsgraph
   ../../draw
   ../../gpu
@@ -29,7 +30,6 @@ set(INC
   ../../makesrna
   ../../nodes
   ../../render
-  ../../compositor
   ../../windowmanager
   ../../../../intern/glew-mx
   ../../../../intern/guardedalloc
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index 74f99540bee..8e989f5568e 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -46,12 +46,12 @@ set(SRC
   space_outliner.c
   tree/common.cc
   tree/tree_display.cc
+  tree/tree_display_data.cc
   tree/tree_display_libraries.cc
-  tree/tree_display_view_layer.cc
-  tree/tree_display_sequencer.cc
   tree/tree_display_orphaned.cc
   tree/tree_display_scenes.cc
-  tree/tree_display_data.cc
+  tree/tree_display_sequencer.cc
+  tree/tree_display_view_layer.cc
   tree/tree_element.cc
   tree/tree_element_anim_data.cc
   tree/tree_element_driver_base.cc
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 0371b4e271f..9242fc15021 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -22,13 +22,13 @@ set(INC
   ../../blenlib
   ../../blentranslation
   ../../bmesh
+  ../../depsgraph
   ../../draw
   ../../gpu
   ../../imbuf
   ../../makesdna
   ../../makesrna
   ../../render
-  ../../depsgraph
   ../../windowmanager
   ../../../../intern/glew-mx
   ../../../../intern/guardedalloc
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 73d6a376da6..a2eb68a1b71 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -22,12 +22,12 @@ set(INC
   ../../blenlib
   ../../blentranslation
   ../../bmesh
+  ../../depsgraph
   ../../gpu
   ../../ikplugin
   ../../makesdna
   ../../makesrna
   ../../render
-  ../../depsgraph
   ../../sequencer
   ../../windowmanager
   ../../../../intern/glew-mx
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 8e4a3df920e..1c8a56e0608 100644
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -35,11 +35,11 @@ set(INC
 set(SRC
   uvedit_buttons.c
   uvedit_draw.c
+  uvedit_islands.c
   uvedit_ops.c
   uvedit_parametrizer.c
   uvedit_path.c
   uvedit_rip.c
-  uvedit_islands.c
   uvedit_select.c
   uvedit_smart_stitch.c
   uvedit_unwrap_ops.c
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 26f31412724..60c102de515 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -78,6 +78,7 @@ set(SRC
   intern/MOD_meshsequencecache.c
   intern/MOD_mirror.c
   intern/MOD_multires.c
+  intern/MOD_nodes.cc
   intern/MOD_none.c
   intern/MOD_normal_edit.c
   intern/MOD_ocean.c
@@ -88,7 +89,6 @@ set(SRC
   intern/MOD_shapekey.c
   intern/MOD_shrinkwrap.c
   intern/MOD_simpledeform.c
-  intern/MOD_nodes.cc
   intern/MOD_skin.c
   intern/MOD_smooth.c
   intern/MOD_softbody.c
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index d09b1a8534d..87055a934fd 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -22,9 +22,9 @@ set(INC
   .
   composite
   function
+  geometry
   intern
   shader
-  geometry
   texture
   ../blenkernel
   ../blenlib
@@ -140,15 +140,15 @@ set(SRC
 
   geometry/nodes/node_geo_attribute_fill.cc
   geometry/nodes/node_geo_attribute_math.cc
-  geometry/nodes/node_geo_common.cc
   geometry/nodes/node_geo_boolean.cc
+  geometry/nodes/node_geo_common.cc
   geometry/nodes/node_geo_edge_split.cc
   geometry/nodes/node_geo_join_geometry.cc
   geometry/nodes/node_geo_object_info.cc
-  geometry/nodes/node_geo_subdivision_surface.cc
   geometry/nodes/node_geo_point_distribute.cc
   geometry/nodes/node_geo_point_instance.cc
   geometry/nodes/node_geo_random_attribute.cc
+  geometry/nodes/node_geo_subdivision_surface.cc
   geometry/nodes/node_geo_transform.cc
   geometry/nodes/node_geo_triangulate.cc
   geometry/node_geometry_exec.cc
@@ -296,12 +296,12 @@ set(SRC
   NOD_composite.h
   NOD_derived_node_tree.hh
   NOD_function.h
+  NOD_geometry.h
+  NOD_math_functions.hh
   NOD_node_tree_dependencies.hh
   NOD_node_tree_multi_function.hh
   NOD_node_tree_ref.hh
   NOD_shader.h
-  NOD_geometry.h
-  NOD_math_functions.hh
   NOD_socket.h
   NOD_static_types.h
   NOD_texture.h
@@ -312,9 +312,9 @@ set(SRC
 )
 
 set(LIB
+  bf_bmesh
   bf_functions
   bf_intern_sky
-  bf_bmesh
 )
 
 if(WITH_PYTHON)
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index d1f69ddfc02..0046474d064 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -60,9 +60,9 @@ set(SRC
   RE_texture.h
 
   intern/initrender.h
+  intern/pipeline.h
   intern/render_result.h
   intern/render_types.h
-  intern/pipeline.h
   intern/texture_common.h
   intern/zbuf.h
 )
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 18755e7e6bc..db46fe91718 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -21,6 +21,7 @@
 set(INC
   .
   intern
+  ../blenfont
   ../blenkernel
   ../blenlib
   ../blenloader
@@ -30,7 +31,6 @@ set(INC
   ../makesdna
   ../makesrna
   ../render
-  ../blenfont
   ../windowmanager
   ../../../intern/atomic
   ../../../intern/guardedalloc
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index b48f4bdd4b9..7db936b3e51 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -29,11 +29,11 @@ blender_include_dirs(
   ../blender/blenloader
   ../blender/depsgraph
   ../blender/editors/include
+  ../blender/gpu
   ../blender/imbuf
+  ../blender/makesdna
   ../blender/makesrna
   ../blender/render
-  ../blender/gpu
-  ../blender/makesdna
   ../blender/windowmanager
 )

More information about the Bf-blender-cvs mailing list