[Bf-blender-cvs] [0fb08b7cc49] master: Cleanup: sort header, cmake paths

[Campbell Barton]

Commit: 0fb08b7cc49d6a589fde476fde145c3d22b8d15d
Author: Campbell Barton
Date:   Tue Jul 14 16:04:18 2020 +1000
Branches: master
https://developer.blender.org/rB0fb08b7cc49d6a589fde476fde145c3d22b8d15d

Cleanup: sort header, cmake paths

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

M	source/blender/blenlib/intern/storage.c
M	source/blender/blenloader/CMakeLists.txt
M	source/blender/bmesh/CMakeLists.txt
M	source/blender/gpencil_modifiers/CMakeLists.txt
M	source/blender/io/alembic/CMakeLists.txt
M	source/blender/io/common/CMakeLists.txt
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/shader_fx/CMakeLists.txt

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

diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index cd5cc5d64f1..d6ae408f53e 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -53,9 +53,9 @@
 #  include "BLI_string_utf8.h"
 #  include "BLI_winstuff.h"
 #  include "utfconv.h"
+#  include <ShObjIdl.h>
 #  include <direct.h>
 #  include <io.h>
-#  include <ShObjIdl.h>
 #  include <stdbool.h>
 #else
 #  include <pwd.h>
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 09e2f4bf417..7eab0651d97 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -63,8 +63,8 @@ set(SRC
 
   BLO_blend_defs.h
   BLO_blend_validate.h
-  BLO_readfile.h
   BLO_read_write.h
+  BLO_readfile.h
   BLO_undofile.h
   BLO_writefile.h
   intern/readfile.h
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 43d12e8eeed..0943b4a9c2a 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -117,9 +117,9 @@ set(SRC
   intern/bmesh_private.h
   intern/bmesh_query.c
   intern/bmesh_query.h
+  intern/bmesh_query_inline.h
   intern/bmesh_query_uv.c
   intern/bmesh_query_uv.h
-  intern/bmesh_query_inline.h
   intern/bmesh_structure.c
   intern/bmesh_structure.h
   intern/bmesh_structure_inline.h
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index 92aacc74190..497cb4a10a5 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -42,7 +42,6 @@ set(INC_SYS
 )
 
 set(SRC
-  intern/MOD_gpencil_util.h
   intern/MOD_gpencil_ui_common.c
 
   intern/MOD_gpencil_util.c
@@ -65,8 +64,9 @@ set(SRC
   intern/MOD_gpenciltime.c
   intern/MOD_gpenciltint.c
 
-  intern/MOD_gpencil_ui_common.h
   MOD_gpencil_modifiertypes.h
+  intern/MOD_gpencil_ui_common.h
+  intern/MOD_gpencil_util.h
 )
 
 set(LIB
diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt
index da36272b850..681d6d04acd 100644
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -63,8 +63,8 @@ set(SRC
   exporter/abc_writer_camera.cc
   exporter/abc_writer_curves.cc
   exporter/abc_writer_hair.cc
-  exporter/abc_writer_mesh.cc
   exporter/abc_writer_mball.cc
+  exporter/abc_writer_mesh.cc
   exporter/abc_writer_nurbs.cc
   exporter/abc_writer_points.cc
   exporter/abc_writer_transform.cc
@@ -89,8 +89,8 @@ set(SRC
   exporter/abc_writer_camera.h
   exporter/abc_writer_curves.h
   exporter/abc_writer_hair.h
-  exporter/abc_writer_mesh.h
   exporter/abc_writer_mball.h
+  exporter/abc_writer_mesh.h
   exporter/abc_writer_nurbs.h
   exporter/abc_writer_points.h
   exporter/abc_writer_transform.h
diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt
index d2be4bbb58f..708f24ca0e2 100644
--- a/source/blender/io/common/CMakeLists.txt
+++ b/source/blender/io/common/CMakeLists.txt
@@ -31,9 +31,9 @@ set(INC_SYS
 
 set(SRC
   intern/abstract_hierarchy_iterator.cc
-  intern/object_identifier.cc
   intern/dupli_parent_finder.cc
   intern/dupli_persistent_id.cc
+  intern/object_identifier.cc
 
   IO_abstract_hierarchy_iterator.h
   IO_dupli_persistent_id.hh
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 9c2ee00a900..c2f1e204073 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -69,6 +69,7 @@ set(DEFSRC
   rna_packedfile.c
   rna_palette.c
   rna_particle.c
+  rna_pointcloud.c
   rna_pose.c
   rna_render.c
   rna_rigidbody.c
@@ -82,7 +83,6 @@ set(DEFSRC
   rna_sound.c
   rna_space.c
   rna_speaker.c
-  rna_pointcloud.c
   rna_test.c
   rna_text.c
   rna_texture.c
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 80a1ebab64e..cf87e3598b6 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -23,9 +23,9 @@ set(INC
   intern
   ../blenfont
   ../blenkernel
-  ../blentranslation
   ../blenlib
   ../blenloader
+  ../blentranslation
   ../bmesh
   ../depsgraph
   ../editors/include
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt
index 740f7c126d1..a12f36f9713 100644
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -24,8 +24,8 @@ set(INC
   intern
   ../blenfont
   ../blenkernel
-  ../blentranslation
   ../blenlib
+  ../blentranslation
   ../bmesh
   ../depsgraph
   ../editors/include