Cleanup: sort CMake include paths

2019-04-24 14:39:31 +10:00
parent 1b839e85e1
commit 2753959ed7
57 changed files with 96 additions and 96 deletions
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -25,11 +25,11 @@ set(INC
  ../blentranslation
  ../editors/include
  ../gpu
+  ../imbuf
  ../makesdna
  ../makesrna
-  ../imbuf
-  ../../../intern/guardedalloc
  ../../../intern/glew-mx
+  ../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -24,29 +24,29 @@ set(INC
  ../blenlib
  ../blenloader
  ../blentranslation
+  ../bmesh
  ../depsgraph
  ../draw
+  ../gpencil_modifiers
  ../gpu
  ../ikplugin
  ../imbuf
  ../makesdna
  ../makesrna
-  ../bmesh
  ../modifiers
-  ../gpencil_modifiers
-  ../shader_fx
  ../nodes
  ../physics
+  ../shader_fx
  ../render/extern/include
  ../../../intern/ghost
-  ../../../intern/guardedalloc
  ../../../intern/glew-mx
+  ../../../intern/guardedalloc
  ../../../intern/iksolver/extern
-  ../../../intern/memutil
-  ../../../intern/mikktspace
  ../../../intern/atomic
  ../../../intern/clog
  ../../../intern/libmv
+  ../../../intern/memutil
+  ../../../intern/mikktspace
  ../../../intern/opensubdiv
  ../../../extern/curve_fit_nd
  ../../../intern/smoke/extern
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -22,9 +22,9 @@ set(INC
  .
  # ../blenkernel  # dont add this back!
  ../makesdna
-  ../../../intern/guardedalloc
  ../../../intern/atomic
  ../../../intern/eigen
+  ../../../intern/guardedalloc
  ../../../intern/numaapi/include
  ../../../extern/wcwidth
 )
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -24,9 +24,9 @@ set(INC
  ../blenlib
  ../blentranslation
  ../makesdna
-  ../../../intern/guardedalloc
  ../../../intern/atomic
  ../../../intern/eigen
+  ../../../intern/guardedalloc
  ../../../extern/rangetree
 )

--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -41,10 +41,10 @@ set(INC
  ../blentranslation
  ../depsgraph
  ../editors/include
+  ../imbuf
  ../makesdna
  ../makesrna
  ../windowmanager
-  ../imbuf
  ../../../intern/guardedalloc
  ../ikplugin
  ../../../intern/iksolver/extern
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -30,15 +30,15 @@ set(INC
  ../imbuf
  ../makesdna
  ../makesrna
-  ../windowmanager
  ../nodes
+  ../windowmanager
  ../nodes/composite
  ../nodes/intern
  ../render/extern/include
  ../render/intern/include
  ../../../extern/clew/include
-  ../../../intern/guardedalloc
  ../../../intern/atomic
+  ../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -39,9 +39,9 @@ set(INC
  ../render/intern/include
  ../windowmanager

+  ../../../intern/atomic
  ../../../intern/glew-mx
  ../../../intern/guardedalloc
-  ../../../intern/atomic
 )

 set(INC_SYS
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -26,8 +26,8 @@ set(INC
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -26,9 +26,9 @@ set(INC
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
-  ../../../../intern/guardedalloc
  ../../../../intern/eigen
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -26,8 +26,8 @@ set(INC
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
  ../../../../extern/curve_fit_nd
 )

--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -27,9 +27,9 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/eigen
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -22,13 +22,13 @@ set(INC
  ../../blenlib
  ../../blentranslation
  ../../depsgraph
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -30,8 +30,8 @@ set(INC
  ../../makesrna
  ../../python
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -17,16 +17,16 @@

 set(INC
  ../include
+  ../../alembic
  ../../blenkernel
  ../../blenlib
  ../../blentranslation
  ../../bmesh
+  ../../collada
  ../../depsgraph
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../collada
-  ../../alembic
  ../../../../intern/guardedalloc
 )

--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -26,8 +26,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -21,8 +21,8 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../blentranslation
-  ../../depsgraph
  ../../bmesh
+  ../../depsgraph
  ../../gpu
  ../../imbuf
  ../../makesdna
@@ -30,8 +30,8 @@ set(INC
  ../../render/extern/include
  ../../windowmanager
  ../../../../intern/clog
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -22,19 +22,19 @@ set(INC
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
+  ../../gpencil_modifiers
  ../../gpu
  ../../ikplugin
  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../modifiers
-  ../../gpencil_modifiers
-  ../../shader_fx
  ../../python
+  ../../shader_fx
  ../../render/extern/include
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -25,8 +25,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -21,17 +21,17 @@ set(INC
  ../../blenlib
  ../../blenloader
  ../../blentranslation
+  ../../bmesh
  ../../depsgraph
  ../../draw
  ../../gpu
  ../../imbuf
-  ../../bmesh
  ../../makesdna
  ../../makesrna
  ../../render/extern/include
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -29,8 +29,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -29,8 +29,8 @@ set(INC
  ../../makesrna
  ../../render/extern/include
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -24,8 +24,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -24,8 +24,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -24,13 +24,13 @@ set(INC
  ../../blenlib
  ../../blentranslation
  ../../depsgraph
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -24,8 +24,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -22,15 +22,15 @@ set(INC
  ../../blenlib
  ../../blenloader
  ../../blentranslation
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../render/extern/include
  ../../windowmanager
  ../../../../intern/atomic
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -25,8 +25,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -23,14 +23,14 @@ set(INC
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../render/extern/include
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -22,15 +22,15 @@ set(INC
  ../../blenlib
  ../../blenloader
  ../../blentranslation
-  ../../depsgraph
-  ../../imbuf
  ../../bmesh
+  ../../depsgraph
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -25,8 +25,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -22,16 +22,16 @@ set(INC
  ../../blenlib
  ../../blentranslation
  ../../depsgraph
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../render/extern/include
-  ../../windowmanager
  ../../compositor
-  ../../../../intern/guardedalloc
+  ../../windowmanager
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -21,13 +21,13 @@ set(INC
  ../../blenlib
  ../../blentranslation
  ../../depsgraph
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -23,8 +23,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -20,14 +20,14 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../blentranslation
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/atomic
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -25,8 +25,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -25,8 +25,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_topbar/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -25,8 +25,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -28,10 +28,10 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../render/extern/include
-  ../../windowmanager
  ../../depsgraph
-  ../../../../intern/guardedalloc
+  ../../windowmanager
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
  ../../../../intern/smoke/extern
 )

--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -27,10 +27,10 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../render/extern/include
-  ../../windowmanager
  ../../depsgraph
-  ../../../../intern/guardedalloc
+  ../../windowmanager
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -24,8 +24,8 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/clog
+  ../../../../intern/guardedalloc
 )

 set(SRC
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -22,14 +22,14 @@ set(INC
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
-  ../../imbuf
  ../../gpu
+  ../../imbuf
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/clog
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -26,9 +26,9 @@ set(INC
  ../../makesdna
  ../../makesrna
  ../../windowmanager
-  ../../../../intern/guardedalloc
  ../../../../intern/eigen
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -22,17 +22,17 @@
 set(INC
  .
  intern
+  ../blenfont
  ../blenkernel
  ../blenlib
-  ../blenfont
+  ../bmesh
  ../depsgraph
  ../makesdna
  ../makesrna
-  ../bmesh
  ../render/extern/include
  ../../../intern/elbeem/extern
-  ../../../intern/guardedalloc
  ../../../intern/eigen
+  ../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -31,10 +31,10 @@ set(INC
  ../blenkernel
  ../blenlib
  ../bmesh
+  ../draw
  ../imbuf
  ../makesdna
  ../makesrna
-  ../draw

  ../editors/include

--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -23,8 +23,8 @@
 add_definitions(-DWITH_DNA_GHASH)

 blender_include_dirs(
-  ../../../../intern/guardedalloc
  ../../../../intern/atomic
+  ../../../../intern/guardedalloc
  ../../blenlib
  ..
 )
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -320,13 +320,13 @@ blender_include_dirs(
  ../../blenfont
  ../../blenkernel
  ../../blenlib
-  ../../bmesh
  ../../blentranslation
+  ../../bmesh
  ../../depsgraph
  ../../draw
  ../../gpu
-  ../../imbuf
  ../../ikplugin
+  ../../imbuf
  ../../makesdna
  ../../nodes/
  ../../physics
@@ -334,9 +334,9 @@ blender_include_dirs(
  ../../editors/include
  ../../render/extern/include
  ../../../../intern/cycles/blender
-  ../../../../intern/guardedalloc
-  ../../../../intern/glew-mx
  ../../../../intern/atomic
+  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
  ../../../../intern/memutil
  ../../../../intern/smoke/extern
 )
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -21,17 +21,17 @@
 set(INC
  .
  intern
+  ../blenfont
  ../blenkernel
  ../blenlib
-  ../blenfont
+  ../bmesh
  ../depsgraph
  ../makesdna
  ../makesrna
-  ../bmesh
  ../render/extern/include
  ../../../intern/elbeem/extern
-  ../../../intern/guardedalloc
  ../../../intern/eigen
+  ../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -33,8 +33,8 @@ set(INC
  ../makesdna
  ../makesrna
  ../render/extern/include
-  ../../../intern/guardedalloc
  ../../../intern/glew-mx
+  ../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/physics/CMakeLists.txt
+++ b/source/blender/physics/CMakeLists.txt
@@ -21,8 +21,8 @@
 set(INC
  .
  intern
-  ../blenlib
  ../blenkernel
+  ../blenlib
  ../depsgraph
  ../imbuf
  ../makesdna
--- a/source/blender/python/bmesh/CMakeLists.txt
+++ b/source/blender/python/bmesh/CMakeLists.txt
@@ -17,9 +17,9 @@

 set(INC
  .
-  ../../bmesh
  ../../blenkernel
  ../../blenlib
+  ../../bmesh
  ../../depsgraph
  ../../makesdna
  ../../../../intern/guardedalloc
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -21,8 +21,8 @@ set(INC
  ../../blenlib
  ../../gpu
  ../../makesdna
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -21,8 +21,8 @@ set(INC
  ../../blenlib
  ../../gpu
  ../../makesdna
-  ../../../../intern/guardedalloc
  ../../../../intern/glew-mx
+  ../../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/python/mathutils/CMakeLists.txt
+++ b/source/blender/python/mathutils/CMakeLists.txt
@@ -17,8 +17,8 @@

 set(INC
  .
-  ../../blenlib
  ../../blenkernel
+  ../../blenlib
  ../../bmesh
  ../../depsgraph
  ../../makesdna
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -25,14 +25,14 @@ set(INC
  ../blenkernel
  ../blenlib
  ../blentranslation
-  ../imbuf
  ../depsgraph
+  ../draw
+  ../gpu
+  ../imbuf
  ../makesdna
  ../makesrna
  ../nodes
  ../physics
-  ../draw
-  ../gpu
  ../../../intern/atomic
  ../../../intern/guardedalloc
  ../../../intern/mikktspace
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -22,17 +22,17 @@
 set(INC
  .
  intern
+  ../blenfont
  ../blenkernel
  ../blenlib
-  ../blenfont
+  ../bmesh
  ../depsgraph
  ../makesdna
  ../makesrna
-  ../bmesh
  ../render/extern/include
  ../../../intern/elbeem/extern
-  ../../../intern/guardedalloc
  ../../../intern/eigen
+  ../../../intern/guardedalloc
 )

 set(INC_SYS
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -39,8 +39,8 @@ set(INC
  ../render/extern/include
  ../../../intern/clog
  ../../../intern/ghost
-  ../../../intern/guardedalloc
  ../../../intern/glew-mx
+  ../../../intern/guardedalloc
  ../../../intern/memutil
 )

--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -22,18 +22,18 @@ setup_libdirs()

 blender_include_dirs(
  ../../intern/clog
-  ../../intern/guardedalloc
  ../../intern/glew-mx
-  ../blender/blenlib
+  ../../intern/guardedalloc
  ../blender/blenkernel
+  ../blender/blenlib
  ../blender/blenloader
  ../blender/depsgraph
  ../blender/editors/include
-  ../blender/makesrna
  ../blender/imbuf
+  ../blender/makesrna
  ../blender/render/extern/include
-  ../blender/makesdna
  ../blender/gpu
+  ../blender/makesdna
  ../blender/windowmanager
 )