From 2753959ed7165a2e5b9bb5421fd6b3b744817402 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 24 Apr 2019 14:39:31 +1000 Subject: Cleanup: sort CMake include paths --- source/blender/blenfont/CMakeLists.txt | 4 ++-- source/blender/blenkernel/CMakeLists.txt | 12 ++++++------ source/blender/blenlib/CMakeLists.txt | 2 +- source/blender/bmesh/CMakeLists.txt | 2 +- source/blender/collada/CMakeLists.txt | 2 +- source/blender/compositor/CMakeLists.txt | 4 ++-- source/blender/draw/CMakeLists.txt | 2 +- source/blender/editors/animation/CMakeLists.txt | 2 +- source/blender/editors/armature/CMakeLists.txt | 2 +- source/blender/editors/curve/CMakeLists.txt | 2 +- source/blender/editors/gizmo_library/CMakeLists.txt | 2 +- source/blender/editors/gpencil/CMakeLists.txt | 4 ++-- source/blender/editors/interface/CMakeLists.txt | 2 +- source/blender/editors/io/CMakeLists.txt | 4 ++-- source/blender/editors/mask/CMakeLists.txt | 2 +- source/blender/editors/mesh/CMakeLists.txt | 4 ++-- source/blender/editors/object/CMakeLists.txt | 6 +++--- source/blender/editors/physics/CMakeLists.txt | 2 +- source/blender/editors/render/CMakeLists.txt | 4 ++-- source/blender/editors/screen/CMakeLists.txt | 2 +- source/blender/editors/sculpt_paint/CMakeLists.txt | 2 +- source/blender/editors/space_action/CMakeLists.txt | 2 +- source/blender/editors/space_buttons/CMakeLists.txt | 2 +- source/blender/editors/space_clip/CMakeLists.txt | 4 ++-- source/blender/editors/space_console/CMakeLists.txt | 2 +- source/blender/editors/space_file/CMakeLists.txt | 4 ++-- source/blender/editors/space_graph/CMakeLists.txt | 2 +- source/blender/editors/space_image/CMakeLists.txt | 4 ++-- source/blender/editors/space_info/CMakeLists.txt | 6 +++--- source/blender/editors/space_nla/CMakeLists.txt | 2 +- source/blender/editors/space_node/CMakeLists.txt | 6 +++--- source/blender/editors/space_outliner/CMakeLists.txt | 4 ++-- source/blender/editors/space_script/CMakeLists.txt | 2 +- source/blender/editors/space_sequencer/CMakeLists.txt | 4 ++-- source/blender/editors/space_statusbar/CMakeLists.txt | 2 +- source/blender/editors/space_text/CMakeLists.txt | 2 +- source/blender/editors/space_topbar/CMakeLists.txt | 2 +- source/blender/editors/space_view3d/CMakeLists.txt | 4 ++-- source/blender/editors/transform/CMakeLists.txt | 4 ++-- source/blender/editors/undo/CMakeLists.txt | 2 +- source/blender/editors/util/CMakeLists.txt | 4 ++-- source/blender/editors/uvedit/CMakeLists.txt | 2 +- source/blender/gpencil_modifiers/CMakeLists.txt | 6 +++--- source/blender/gpu/CMakeLists.txt | 2 +- source/blender/makesdna/intern/CMakeLists.txt | 2 +- source/blender/makesrna/intern/CMakeLists.txt | 8 ++++---- source/blender/modifiers/CMakeLists.txt | 6 +++--- source/blender/nodes/CMakeLists.txt | 2 +- source/blender/physics/CMakeLists.txt | 2 +- source/blender/python/bmesh/CMakeLists.txt | 2 +- source/blender/python/generic/CMakeLists.txt | 2 +- source/blender/python/gpu/CMakeLists.txt | 2 +- source/blender/python/mathutils/CMakeLists.txt | 2 +- source/blender/render/CMakeLists.txt | 6 +++--- source/blender/shader_fx/CMakeLists.txt | 6 +++--- source/blender/windowmanager/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 8 ++++---- 57 files changed, 96 insertions(+), 96 deletions(-) diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index e16ff10c76d..ba8697a44b6 100644 --- 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 diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index cd612cd9d8c..e564e91749c 100644 --- 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 diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index f4b951dc8a3..dbc72ff1213 100644 --- 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 ) diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 4ba9d13c8a0..f5095ca2b5f 100644 --- 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 ) diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index d104d01af56..e54b788903d 100644 --- 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 diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 49aee93c8a4..308a95c0e0c 100644 --- 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 diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 0d1752af4dc..bdf450fab9c 100644 --- 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 diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index b67298a6df6..978bd772b6f 100644 --- 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 diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index 274fa86184d..71c7febe192 100644 --- 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 diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index 3df6f3c97d4..8c9309055c8 100644 --- 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 ) diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt index 8b035d3207d..d9503c4e759 100644 --- 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 diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 5573c88c710..21f1801f7eb 100644 --- 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 diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 622f89b1f87..55a44b4d314 100644 --- 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 diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index fbbb8621ae6..5a35b251d0c 100644 --- 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 ) diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt index 9dabcc0e8bb..81c861ab4e4 100644 --- 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 diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index e67d63b01a5..57bf67e825e 100644 --- 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 diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 8ef0d85bcfd..eaef9313431 100644 --- 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 diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 3eb443320c3..021c17a94c2 100644 --- 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 diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 5d414c3af0f..6c62dbcb3a2 100644 --- 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 diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 9576920bcd2..dc355148ad3 100644 --- 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 diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index cddaf69b965..23617e687ea 100644 --- 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 diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 5251ebb1267..6c43f8b9549 100644 --- 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 diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index ce08b62e8ef..25ff6bbd098 100644 --- 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 diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index ed98dcdc159..2ea4bc97d18 100644 --- 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 diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 5070b6fcf65..33934832ccc 100644 --- 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 diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 6bf975b98e0..33f57b9c235 100644 --- 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 diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index cf5ffdb2be5..f4d31886e3f 100644 --- 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 diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 70b7387bf6b..61e6b065cba 100644 --- 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 diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index bb403751fe2..ad410e0aade 100644 --- 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 diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 3048c64c49e..60152bffaf4 100644 --- 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 diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index df1b7c03aab..03c83305618 100644 --- 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 diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index f08069c418b..d235dd47136 100644 --- 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 diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 1abc05d2270..0bd2a01a151 100644 --- 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 diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 8b97f7537f8..4668a9cef90 100644 --- 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 diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt index 39957c6792c..ad4c060a1f6 100644 --- 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 diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index f5db86ac4c2..740fc9948ef 100644 --- 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 diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt index 71e61a07ff7..d56e1da334d 100644 --- 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 diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 1514f7a236b..dc375958eb4 100644 --- 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 ) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 05e0659637b..9696f0fb315 100644 --- 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 diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt index 7c1a074bb13..0f4152c9128 100644 --- 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 diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index a1893d8e6f1..3b49784d5eb 100644 --- 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 diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 240cfd382a4..d2ba9ab9591 100644 --- 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 diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt index 6c7f2bb3685..41543448a15 100644 --- 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 diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index f949a79d039..5a42c4d3d1b 100644 --- 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 diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index a5a98386347..178ef219c4d 100644 --- 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 .. ) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index eae47469f10..7c31f078b6d 100644 --- 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 ) diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 691a0e369e6..5116fefde94 100644 --- 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 diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index b76a87d7132..80afcada4b9 100644 --- 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 diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt index e40d1de666b..edcfdceb697 100644 --- 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 diff --git a/source/blender/python/bmesh/CMakeLists.txt b/source/blender/python/bmesh/CMakeLists.txt index 14baa08abc1..3875057185a 100644 --- 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 diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index fa73f161a5d..c878103e19d 100644 --- 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 diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt index cda866510e3..ca0e6ced42b 100644 --- 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 diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt index a58260a84f6..cdb562a3233 100644 --- 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 diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index da82e606bda..e265197646c 100644 --- 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 diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt index 7d36e8836fd..57c7345076e 100644 --- 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 diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index d6107033eb7..7e53c652ab5 100644 --- 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 ) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 877d9c971a3..0f7612abb0c 100644 --- 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 ) -- cgit v1.2.3