cmake: cleanup include paths, some duplicates and going up some unneeded dirs.

diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt
index a4f85a2fdfde25656172456994405827275b976a..753e28091d33ea44556648bac73938737de5e735 100644 (file)
--- a/extern/binreloc/CMakeLists.txt
+++ b/extern/binreloc/CMakeLists.txt
@@ -19,7 +19,7 @@
 #
 
 set(INC
-       ./include
+       include
 )
 
 set(INC_SYS

diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index a7ebe36f950e37388597e5350811e891f5337544..87f8bb6e94096fa8336b67d9770b291186529e70 100644 (file)
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -25,7 +25,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ./include
+       include
 )
 
 set(INC_SYS

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 73ad0093c7325858fee38460bee06669957335a1..7eef13b103beb9e9cdaa74656bce3bd99a548d08 100644 (file)
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -22,9 +22,9 @@
 
 set(INC
        .
-       intern
        FX
        SRC
+       intern
        ../ffmpeg
 )
 

diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt
index 7a95d5561723a9ffb1247c2c765b85a569bb1b33..742c0f1d42c4844fb070e169e7e2b4fee82b84df 100644 (file)
--- a/intern/boolop/CMakeLists.txt
+++ b/intern/boolop/CMakeLists.txt
@@ -26,11 +26,11 @@
 
 set(INC        
        .
-       ./intern
-       ./extern
-       ../memutil
+       extern
+       intern
        ../container
        ../guardedalloc
+       ../memutil
        ../moto/include
        ../../source/blender/blenlib
        ../../source/blender/makesdna

diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt
index 792f6aa1327fa6a21df58771e09f4ad17919ac76..a844db3257ed29d127136daf9e4914b0ae13d509 100644 (file)
--- a/intern/bsp/CMakeLists.txt
+++ b/intern/bsp/CMakeLists.txt
@@ -25,11 +25,11 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ./intern
+       intern
        ../container
        ../guardedalloc
-       ../moto/include
        ../memutil
+       ../moto/include
 )
 
 set(INC_SYS

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index f49d075d9f992759c92858a1d28b2f9e5bee9a83..ccd763ef42ce74818c70f6950efbfe80e8ac448c 100644 (file)
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -37,9 +37,8 @@ set(INC_SYS
 
 set(SRC
        intern/GHOST_Buttons.cpp
-       intern/GHOST_CallbackEventConsumer.cpp
        intern/GHOST_C-api.cpp
-       intern/GHOST_Path-api.cpp
+       intern/GHOST_CallbackEventConsumer.cpp
        intern/GHOST_DisplayManager.cpp
        intern/GHOST_EventManager.cpp
        intern/GHOST_ISystem.cpp
@@ -47,6 +46,7 @@ set(SRC
        intern/GHOST_ModifierKeys.cpp
        intern/GHOST_NDOFManager.cpp
        intern/GHOST_Path-api.cpp
+       intern/GHOST_Path-api.cpp
        intern/GHOST_Rect.cpp
        intern/GHOST_System.cpp
        intern/GHOST_TimerManager.cpp
@@ -63,6 +63,7 @@ set(SRC
        GHOST_Path-api.h
        GHOST_Rect.h
        GHOST_Types.h
+
        intern/GHOST_Buttons.h
        intern/GHOST_CallbackEventConsumer.h
        intern/GHOST_Debug.h

diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index bae61fd678b268e45af48dbe0961e6db03cb522f..0fd6435ec4e591155e0fb820b4e9a837a312676a 100644 (file)
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -26,8 +26,8 @@
 
 set(INC 
        .
-       ../../../intern/guardedalloc
        ../blenlib
+       ../../../intern/guardedalloc
 )
 
 set(INC_SYS

diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index 0258a41fb56c188c03629d7824f388c2bccedf08..82099d4f125a9687d0d16f394da03919d91042fb 100644 (file)
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -24,10 +24,10 @@
 
 set(INC
        .
+       ../blenkernel
        ../blenlib
-       ../makesdna
        ../editors/include
-       ../blenkernel
+       ../makesdna
        ../../../intern/guardedalloc
 )
 

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index a3c3357508fd7cb298a18ce3bbcae36759f244dc..9a384c40e24e02e1364ae35dee3bd03a1e6c73ff 100644 (file)
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -55,7 +55,7 @@ set(INC
        ../../../intern/smoke/extern
 
        # XXX - BAD LEVEL CALL WM_api.h
-       ../../../source/blender/windowmanager
+       ../windowmanager
 )
 
 set(INC_SYS

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index de7695b63cf0539bdb75c65ec3f47dccc923c376..b4fc983008ca82b4a5222ae25c825498533407d8 100644 (file)
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -26,10 +26,10 @@
 
 set(INC 
        .
-       ../makesdna
        ../blenkernel
        ../blenloader
        ../gpu
+       ../makesdna
        ../../../intern/ghost
        ../../../intern/guardedalloc
 )

diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 312a6546e22c6736a39bf09c224fad3054eeb39d..be15b191c8a236f4c064e833ac0d509a35527452 100644 (file)
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -26,8 +26,8 @@
 
 set(INC 
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../makesdna
        ../makesrna
        ../render/extern/include

diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt
index 193e40147e102545d00d37e4757c59200c589a0a..9d398291b858a8abbc27ce1c907d3b9c5ac7a274 100644 (file)
--- a/source/blender/blenpluginapi/CMakeLists.txt
+++ b/source/blender/blenpluginapi/CMakeLists.txt
@@ -28,9 +28,9 @@ set(INC
        .
        ..
        ../blenlib
+       ../blenloader
        ../imbuf
        ../makesdna
-       ../blenloader
        ../../../intern/guardedalloc
 )
 

diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index 07da532146f03b40a9ed1547ecbe842899a62c09..e2a68d196822bbb7bd9ca2b6f8aedf74679ebb75 100644 (file)
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -28,13 +28,13 @@ remove_strict_flags()
 
 set(INC
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
-       ../windowmanager
+       ../editors/include
        ../makesdna
        ../makesrna
-       ../editors/include
+       ../windowmanager
        ../../../intern/guardedalloc
 )
 

diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index a3c1d035d9b4bdb49117f7de9541e86234246e54..83fe91d6f76ab0f81dbbf2d438686b9acfbec5cb 100644 (file)
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 2db6e2784604f560cdfba5f133d4b4c4fb0970f5..9a44525611acbdd34d3d36cca92212eb5799444a 100644 (file)
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index dfc7e336e84fee5a182f6781f785bc5eb809c917..9bad02eca1fef6512a8f17c79b82faeba42725c5 100644 (file)
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 352960d285a9ace070a040f4ff4d03348994bf58..7a2f196fd6d314df5469d11e97a71264de057296 100644 (file)
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna

diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 6dd7af70e33589fd107bedbc76505e82cda5b1bf..cc4c1eaa21cdf2a1f681e8bd931ba135b93dc64e 100644 (file)
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../imbuf
        ../../makesdna

diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index bd8789b9eeff291748818e2c949622d02681ca82..02a25a2a122740896449461eb9a8f17a585379e0 100644 (file)
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -22,13 +22,13 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt
index 690a8ec2fcb99c79b783986b1cc237f11b86b961..76561b121835981455911bb30e098c3a3a606282 100644 (file)
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../render/extern/include

diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 4d50b78b7a1b8a579241110f7e3650f8a71405fb..14b40d55f11ad4095e06fdb039803276b50c5cfd 100644 (file)
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -22,16 +22,16 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../ikplugin
        ../../imbuf
        ../../makesdna
        ../../makesrna
        ../../python
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index 1badccffe3b8c5982b39c1ace47fe8e34aa1b567..f32b23cd3ee82927212fa2bc7577867d516a774f 100644 (file)
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 54341257692d6b5236fddd7eabd434398be9aedb..4282110901b91cb392c165619109a1569f6970d9 100644 (file)
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna

diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 6ecbc9c5eecdd02e9ac977522dbdfd794d5812d6..94e08a020f64b89ee71985b8fd267a8998e58574 100644 (file)
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -22,14 +22,14 @@
 set(INC
        ../include
        ../../blenkernel
+       ../../blenlib
        ../../blenloader
-       ../../imbuf
        ../../gpu
-       ../../blenlib
+       ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index 55af283b5ded6e54d448da90342f23db252deea8..f66288812ad72c91cf7e23f78134d9c83e19a399 100644 (file)
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt
index 6789556aa2b0a9be71861ae8e7e7c59997827c6c..edebaa8273a347d62a8c8a498365d657071b0335 100644 (file)
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
index c2dc2582c82e701f5238a71f4a3ba16e660319ca..4cbb290be765393a08dfd8999fec65373f724bd9 100644 (file)
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index 0a4f251e46f4cb51b0ddfaedd8b4068c01db7c11..631e2adea34fd06db8e8562cb3e02735d963055e 100644 (file)
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index afa746ea359cfad117b061ff0403d7afbbcdd9a2..4aa6cdbcf2fb373d9e3e0915d7523dab03c3ee82 100644 (file)
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -28,8 +28,8 @@ set(INC
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index b7cde90546c5f6cbb69ea6988fad42c69c237750..80205ad556456759e003c0cae734dd4c000b0207 100644 (file)
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 7c2d7ffb47bfb948dd3566f50caaa5b91e641ee3..0d4408faf49dc966bdc6249891c3a2f08085941b 100644 (file)
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -23,13 +23,13 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index c6ed1b7bac76cfb58cfc0a6711fd14048fb2e215..22347df93a32ee158d758b9417799cf9bc0907bd 100644 (file)
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna

diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt
index cd24cb5e5d00fe9ecf1ff3ff866ee471ad19c58e..4447190204070019bd0a87c3c1619527caa9ecde 100644 (file)
--- a/source/blender/editors/space_logic/CMakeLists.txt
+++ b/source/blender/editors/space_logic/CMakeLists.txt
@@ -21,13 +21,13 @@
 
 set(INC
        ../include
+       ../interface
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager
-       ../../editors/interface
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt
index 1bf04f4dc376ec9a8050552b4d08a71168ae9ef6..b05d157365d27343b14ae7c954854ed7e3fdf6ff 100644 (file)
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index 9172bc4e9eb34d8ac3f8ad3d9876495d1dd08f26..dcd6bcd34035451e807140a681392303655bbecf 100644 (file)
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -23,14 +23,14 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna
        ../../nodes
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
 )

diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index c05350c256fa43835c917c35c94bd1e8e749a73a..4194d463e103ec97917c6537acf81f58db0fcbb7 100644 (file)
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna

diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt
index 1884852d3ad89c6725eedef8fc8f151ddd4d8e50..9d3bd4a67aaa50c0fc71d880689a544f84ddb8bc 100644 (file)
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 71a4cfca8688ac21b59683dc01044a652a5593bb..9ce5f8e5279cfdceee82504469552df33575d4f7 100644 (file)
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../imbuf
        ../../makesdna
        ../../makesrna

diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt
index 367d07c0c0bd4523a10350ad5b3169ba6b18f20b..870065966ccc6539e9377be209c2791d6f50580a 100644 (file)
--- a/source/blender/editors/space_sound/CMakeLists.txt
+++ b/source/blender/editors/space_sound/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt
index 145da6c9aaa0e37317f47590f8abfc600a3e9e69..acf00d205a60bda5f66362fad3b8b90dd05894e1 100644 (file)
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -23,8 +23,8 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt
index 79081c7cfd4d34e896ff9bc5120e49e0711af9a7..758d1e629f94385bc548baee8f78078ae83ff321 100644 (file)
--- a/source/blender/editors/space_time/CMakeLists.txt
+++ b/source/blender/editors/space_time/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt
index 656a5d2f0effccf14958820eaae15badfab20b08..43ac90dce945f25910e49450349694ba16e933ed 100644 (file)
--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index e83e51aaa4ffe373546468a3a1f4e360ca7485a0..c6e936606c86b3af661a460080c619e463ba9b44 100644 (file)
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -23,14 +23,14 @@ set(INC
        ../include
        ../../blenfont
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../gpu
        ../../imbuf
        ../../makesdna
        ../../makesrna
-       ../../windowmanager
        ../../render/extern/include
+       ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/smoke/extern
 )
@@ -62,7 +62,7 @@ set(SRC
 
 if(WITH_GAMEENGINE)
        list(APPEND INC
-               ../../../../source/gameengine/BlenderRoutines
+               ../../../gameengine/BlenderRoutines
        )
        add_definitions(-DWITH_GAMEENGINE)
 endif()

diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 8eb8d538396d01771781bd7ed185b0fe611f2620..283b09f42e4fcd11dfdbab42e32ab28b9b37cde1 100644 (file)
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 8e5415945c796feeeeb570c7611697149b961b25..72f13c14f5dfabbf0ffffbcab605702228384427 100644 (file)
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 11e1703d84c465ffb1162545a8e347594c0e68e6..552e1b60154ce4a49cf46f409d9643bd706cc6fe 100644 (file)
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -22,8 +22,8 @@
 set(INC
        ../include
        ../../blenkernel
-       ../../blenloader
        ../../blenlib
+       ../../blenloader
        ../../makesdna
        ../../makesrna
        ../../windowmanager

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 76e347270bac93da033e7aae153bf494d895e455..8f575dfb50bf2f910bef75ad2143bc72b25cc1eb 100644 (file)
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -26,8 +26,8 @@
 
 set(INC
        .
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
        ../imbuf
        ../makesdna

diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index da5c2f69635f13d0222b3e1089d474a9199f60ba..dc637aedd6db3e79a8aca014ba5d9dd9dc4dc1e7 100644 (file)
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -25,10 +25,10 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
+       .
+       ../blenkernel
        ../blenlib
        ../makesdna
-       ../blenkernel
-       ../ikplugin
        ../../../intern/guardedalloc
        ../../../intern/iksolver/extern
 )

diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 1517432f614f0c92b7aa9f99d81f90282735fece..18b5eff5c7358e47fcdbe74db49e2dda00a165ce 100644 (file)
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -32,12 +32,12 @@ endif()
 set(INC 
        .
        ../avi
-       ../blenlib
        ../blenkernel
+       ../blenlib
        ../blenloader
        ../makesdna
-       ../../../intern/memutil
        ../../../intern/guardedalloc
+       ../../../intern/memutil
 )
 
 set(INC_SYS

diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index 079f34af773af0830db75a4835f36d126a34decc..4f7f20beecf22dc619cba12c053559501bd1d6a9 100644 (file)
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -29,8 +29,8 @@ set(INC
        ..
        ../..
        ../../../blenkernel
-       ../../../blenloader
        ../../../blenlib
+       ../../../blenloader
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )

diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index db3c85da884da69f5928269fcf926b2f32b64666..53822b830f732a7f5fd5f08fc7e3943ecec8af71 100644 (file)
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -28,8 +28,8 @@ set(INC
        .
        ..
        ../..
-       ../../../blenlib
        ../../../blenkernel
+       ../../../blenlib
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )

diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index ca638b8356e16bef35ddaa57c75fe41bede7305f..3be5219ae444e0779b1e101af4eafcdc56f719a1 100644 (file)
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -30,8 +30,8 @@ set(INC
        ../..
        ../../../blenkernel
        ../../../blenlib
-       ../../../../../intern/guardedalloc
        ../../../makesdna
+       ../../../../../intern/guardedalloc
 )
 
 set(INC_SYS

diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index ba5a7ac64bcc27f9b1b8c32d13e9465f7233e457..d1f153265acfdbfc295f7b99cb381c9380cb319a 100644 (file)
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -26,15 +26,15 @@
 
 set(INC 
        .
-       ./intern
+       intern
+       ../blenkernel
+       ../blenkernel/intern
        ../blenlib
        ../blenloader
        ../makesdna
-       ../blenkernel
-       ../blenkernel/intern
        ../render/extern/include
-       ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
+       ../../../intern/guardedalloc
 )
 
 set(INC_SYS

diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 794b31b4ed3937f33ca91f036a8c7f6ae2d2fcb2..8dfbf4769957395d50756b3a3d79e503b7b4abb5 100644 (file)
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -20,10 +20,10 @@
 
 set(INC 
        .
-       ../../blenlib
-       ../../makesdna
        ../../blenkernel
+       ../../blenlib
        ../../blenloader
+       ../../makesdna
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index a1eb9585e835fa9f8e326af8000e765e64829657..93a4b3ec2693395ac0bfd442a91f318505e374c9 100644 (file)
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -25,13 +25,13 @@
 
 set(INC 
        ..
+       ../../blenkernel
        ../../blenlib
+       ../../blenloader
+       ../../editors/include
        ../../makesdna
        ../../makesrna
-       ../../blenkernel
-       ../../blenloader
        ../../windowmanager
-       ../../editors/include
        ../../../../intern/guardedalloc
 )
 

diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt
index 6e72f053af766e8a2f84f895925bfae167a8da20..b647466d2a895358cb56f3bd52a61230c7560040 100644 (file)
--- a/source/blender/quicktime/CMakeLists.txt
+++ b/source/blender/quicktime/CMakeLists.txt
@@ -34,7 +34,6 @@ set(INC
        ../imbuf/intern
        ../makesdna
        ../makesrna
-       ../quicktime
        ../render/extern/include
        ../windowmanager
        ../../../intern/guardedalloc

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 9adebffc55e875c7826f0666aa5a6f8e87dc738b..90aef816e2ccc3c98e0a990ab3384ac56db59e7e 100644 (file)
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -26,17 +26,17 @@
 
 
 set(INC 
-       intern/include
        extern/include
+       intern/include
+       ../blenkernel
        ../blenlib
        ../blenloader
+       ../imbuf
        ../makesdna
        ../makesrna
-       ../blenkernel
-       ../imbuf
-       ../../../intern/smoke/extern
-       ../../../intern/mikktspace
        ../../../intern/guardedalloc
+       ../../../intern/mikktspace
+       ../../../intern/smoke/extern
 )
 
 set(INC_SYS

diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index c815b4aad2f614796be6d0fec0789b634a35945e..20ac3ba7077bf057b25bd00b78fdf2f32b5915ce 100644 (file)
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -26,23 +26,23 @@
 
 set(INC
        .
-       ../nodes
-       ../gpu
        ../blenfont
-       ../blenlib
-       ../makesdna
-       ../makesrna
        ../blenkernel
-       ../imbuf
+       ../blenlib
        ../blenloader
        ../editors/include
+       ../gpu
+       ../imbuf
+       ../makesdna
+       ../makesrna
+       ../nodes
        ../render/extern/include
-       ../../../intern/guardedalloc
-       ../../../intern/memutil
+       ../../gameengine/BlenderRoutines
        ../../../intern/elbeem/extern
        ../../../intern/ghost
+       ../../../intern/guardedalloc
+       ../../../intern/memutil
        ../../../intern/opennl/extern
-       ../../../source/gameengine/BlenderRoutines
 )
 
 set(INC_SYS

diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index 80f3642748a6f3a9dc710ffc5376033e2cf8a058..f852d061cf746bdc94c6741645a685037eff3744 100644 (file)
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -29,12 +29,12 @@ remove_strict_flags()
 
 set(INC 
        .
-       .. 
+       ..
+       ../../blender/blenkernel
+       ../../blender/blenloader
+       ../../blender/makesdna
+       ../../blender/makesrna
        ../../../intern/guardedalloc
-       ../../../source/blender/makesdna
-       ../../../source/blender/blenloader
-       ../../../source/blender/makesrna
-       ../../../source/blender/blenkernel
 )
 
 set(INC_SYS

diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 28f567cc3cd55123f0cbe9ec9187f3aeba698b43..5a7304765e48c9b5dcea46f99f8597a51bb1722b 100644 (file)
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -1,33 +1,33 @@
 
 set(INC
        .
-       ../../../intern/string
+       ../Converter
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/Bullet
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenfont
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/editors/include
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/makesrna
+       ../../blender/windowmanager
+       ../../../extern/bullet2/src
        ../../../intern/container
        ../../../intern/guardedalloc
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-       ../../../source/gameengine/Converter
-       ../../../source/blender/imbuf
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji 
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel 
-       ../../../source/blender/blenfont
-       ../../../source/blender/editors/include
-       ../../../source/blender/windowmanager
-       ../../../source/blender
-       ../../../source/blender/makesdna
-       ../../../source/blender/makesrna 
-       ../../../source/gameengine/Rasterizer 
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph 
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Physics/Bullet
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
-       ../../../extern/bullet2/src
+       ../../../intern/string
        ${GLEW_INCLUDE_PATH}
 )
 

diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index c905b8634a060e90acc98adc2deea5de211cc898..45a7701d4046870c5cddd0a8a94d8117c1e531cc 100644 (file)
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -26,36 +26,35 @@
 
 set(INC
        .
-       ../../../intern/string
-       ../../../intern/guardedalloc
+       ../BlenderRoutines
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Ketsji/KXNetwork
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/Bullet
+       ../Physics/Dummy
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/gpu
+       ../../blender/ikplugin
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/makesrna
+       ../../blender/windowmanager
+       ../../../extern/bullet2/src
        ../../../intern/container
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/Converter
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/imbuf
+       ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji
-       ../../../source/gameengine/Ketsji/KXNetwork
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel
-       ../../../source/blender/windowmanager
-       ../../../source/blender
-       ../../../source/blender/makesdna
-       ../../../source/blender/makesrna
-       ../../../source/gameengine/Rasterizer
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Physics/Bullet
-       ../../../source/gameengine/Physics/Dummy
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
-       ../../../source/blender/ikplugin
-       ../../../extern/bullet2/src
+       ../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index 83d44e1b318e0ec9a1f48715b848c5a670d81943..ad987091790ea1e27e836b3285f824aa7ecb880f 100644 (file)
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -26,11 +26,11 @@
 
 set(INC
        .
-       ../../../intern/string
+       ../SceneGraph
+       ../../blender/blenloader
        ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/SceneGraph
-       ../../../source/blender/blenloader
+       ../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index 6e5d8b9485d435ef060ad9014a8007c5c2ef3f71..bd4171653377e6a3d1a548a4a7a4e3324c492be3 100644 (file)
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -25,13 +25,13 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       . 
-       ../../../intern/string
+       .
+       ../Expressions
+       ../Rasterizer
+       ../SceneGraph
        ../../../intern/container
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/SceneGraph
        ../../../intern/moto/include
-       ../../../source/gameengine/Rasterizer
+       ../../../intern/string
 )
 
 set(INC_SYS
@@ -39,8 +39,6 @@ set(INC_SYS
 )
 
 set(SRC
-       Joystick/SCA_Joystick.cpp
-       Joystick/SCA_JoystickEvents.cpp
        SCA_2DFilterActuator.cpp
        SCA_ANDController.cpp
        SCA_ActuatorEventManager.cpp
@@ -81,10 +79,9 @@ set(SRC
        SCA_TimeEventManager.cpp
        SCA_XNORController.cpp
        SCA_XORController.cpp
+       Joystick/SCA_Joystick.cpp
+       Joystick/SCA_JoystickEvents.cpp
 
-       Joystick/SCA_Joystick.h
-       Joystick/SCA_JoystickDefines.h
-       Joystick/SCA_JoystickPrivate.h
        SCA_2DFilterActuator.h
        SCA_ANDController.h
        SCA_ActuatorEventManager.h
@@ -125,6 +122,9 @@ set(SRC
        SCA_TimeEventManager.h
        SCA_XNORController.h
        SCA_XORController.h
+       Joystick/SCA_Joystick.h
+       Joystick/SCA_JoystickDefines.h
+       Joystick/SCA_JoystickPrivate.h
 )
 
 if(WITH_SDL)

diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index d16ec6a2f222f5980ca305d3aaa8991053efd8f9..8c5897fa48ef610de1ebe0585e28df23fa6ac525 100644 (file)
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -26,31 +26,31 @@
 
 set(INC
        .
-       ../../../../intern/string
+       ../ghost
+       ../../BlenderRoutines
+       ../../Converter
+       ../../Expressions
+       ../../GameLogic
+       ../../Ketsji
+       ../../Network
+       ../../Network/LoopBackNetwork
+       ../../Physics/common
+       ../../Rasterizer
+       ../../Rasterizer/RAS_OpenGLRasterizer
+       ../../SceneGraph
+       ../../../blender
+       ../../../blender/blenfont
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/imbuf
+       ../../../blender/makesdna
+       ../../../../intern/container
        ../../../../intern/ghost
        ../../../../intern/guardedalloc
-       ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../../source/gameengine/Converter
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/blender/imbuf
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenfont
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender
-       ../../../../source/blender/makesdna
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/Network
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Physics/common
-       ../../../../source/gameengine/Network/LoopBackNetwork
-       ../../../../source/gameengine/GamePlayer/ghost
-       ../../../../source/blender/blenloader
-       ../../../../source/blender/gpu
+       ../../../../intern/string
 )
 
 set(INC_SYS
@@ -61,7 +61,6 @@ set(INC_SYS
 )
 
 set(SRC 
-       bmfont.cpp
        GPC_Canvas.cpp
        GPC_Engine.cpp
        GPC_KeyboardDevice.cpp
@@ -71,6 +70,7 @@ set(SRC
        GPC_RawLogoArrays.cpp
        GPC_RenderTools.cpp
        GPC_System.cpp
+       bmfont.cpp
 
        GPC_Canvas.h
        GPC_Engine.h

diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 5ac121099c382f04a1e159441508f4f77472e3f8..944ec9abd6726b0059a77b51d80ae0b8904c7850 100644 (file)
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -26,32 +26,32 @@
 
 set(INC
        .
-       ../../../../intern/string
+       ../common
+       ../../BlenderRoutines
+       ../../Converter
+       ../../Expressions
+       ../../GameLogic
+       ../../Ketsji
+       ../../Network
+       ../../Network/LoopBackNetwork
+       ../../Physics/common
+       ../../Rasterizer
+       ../../Rasterizer/RAS_OpenGLRasterizer
+       ../../SceneGraph
+       ../../../blender
+       ../../../blender/blenfont
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/imbuf
+       ../../../blender/makesdna
+       ../../../blender/makesrna
+       ../../../../intern/container
        ../../../../intern/ghost
        ../../../../intern/guardedalloc
-       ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/gameengine/Converter
-       ../../../../source/blender/imbuf
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/blender/blenfont
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/makesrna
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/Network
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Physics/common
-       ../../../../source/gameengine/Network/LoopBackNetwork
-       ../../../../source/gameengine/GamePlayer/common
-       ../../../../source/blender/blenloader
-       ../../../../source/blender/gpu
+       ../../../../intern/string
 )
 
 set(INC_SYS
@@ -62,9 +62,9 @@ set(INC_SYS
 set(SRC 
        GPG_Application.cpp
        GPG_Canvas.cpp
-       GPG_ghost.cpp
        GPG_KeyboardDevice.cpp
        GPG_System.cpp
+       GPG_ghost.cpp
 
        GPG_Application.h
        GPG_Canvas.h

diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 596a04fa862539dde51e84a4a74750061006a54e..8222bf4b65f0288956a134f92f47bb99c5cbdf76 100644 (file)
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -26,33 +26,32 @@
 
 set(INC
        .
-       ../../../intern/string
-       ../../../intern/guardedalloc
+       KXNetwork
+       ../BlenderRoutines
+       ../Converter
+       ../Expressions
+       ../GameLogic
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenfont
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/python
+       ../../blender/python/generic
+       ../../blender/python/mathutils
        ../../../intern/container
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
-       ../../../source/gameengine/Converter
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/imbuf
+       ../../../intern/guardedalloc
        ../../../intern/moto/include
-       ../../../source/gameengine/Ketsji 
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenfont
-       ../../../source/blender/blenkernel
-       ../../../source/blender/python
-       ../../../source/blender/python/generic
-       ../../../source/blender/python/mathutils
-       ../../../source/blender 
-       ../../../source/blender/makesdna 
-       ../../../source/gameengine/Rasterizer 
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/Expressions 
-       ../../../source/gameengine/Ketsji/KXNetwork
-       ../../../source/gameengine/Network
-       ../../../source/gameengine/SceneGraph 
-       ../../../source/gameengine/Physics/common
-       ../../../source/gameengine/Network/LoopBackNetwork
-       ../../../source/blender/blenloader
-       ../../../source/blender/gpu
+       ../../../intern/string
 )
 
 set(INC_SYS
@@ -129,6 +128,10 @@ set(SRC
        KX_WorldInfo.cpp
        KX_WorldIpoController.cpp
 
+       BL_BlenderShader.h
+       BL_Material.h
+       BL_Shader.h
+       BL_Texture.h
        KX_ArmatureSensor.h
        KX_BlenderMaterial.h
        KX_BulletPhysicsController.h
@@ -201,10 +204,6 @@ set(SRC
        KX_VisibilityActuator.h
        KX_WorldInfo.h
        KX_WorldIpoController.h
-       BL_BlenderShader.h
-       BL_Material.h
-       BL_Shader.h
-       BL_Texture.h
 )
 
 add_definitions(-DGLEW_STATIC)
@@ -231,7 +230,7 @@ endif()
 if(WITH_BULLET)
        list(APPEND INC
                ../../../extern/bullet2/src
-               ../../../source/gameengine/Physics/Bullet
+               ../Physics/Bullet
        )
        add_definitions(-DUSE_BULLET)
 endif()

diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
index b814956680169fcff86aff29614433a85c1cb853..1ebf11531507ef0ff2faf7633ccd9299e234d3d7 100644 (file)
--- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
+++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
@@ -26,14 +26,14 @@
 
 set(INC
        .
-       ../../../../intern/string
+       ..
+       ../../Expressions
+       ../../GameLogic
+       ../../Network
+       ../../SceneGraph
        ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/gameengine/GameLogic
-       ../../../../source/gameengine/Expressions
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/Network
+       ../../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt
index e1f3bfaac77c62553216b828a0e467e65f65fef2..4d6d035c63d3f4206d4e7d63674f1e41e6a1570e 100644 (file)
--- a/source/gameengine/Network/CMakeLists.txt
+++ b/source/gameengine/Network/CMakeLists.txt
@@ -26,9 +26,9 @@
 
 set(INC
        .
-       ../../../intern/string
        ../../../intern/container
        ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
index 9c3936987f224e9746b6b950f5f465e6b725d111..c816a30f1a835407cdcbc345f157c78b6e13c5ee 100644 (file)
--- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
+++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
@@ -26,9 +26,9 @@
 
 set(INC
        .
-       ../../../../intern/string
+       ..
        ../../../../intern/container
-       ../../../../source/gameengine/Network
+       ../../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index aadd11cc0364788e04856fb15265c200005db5e8..971c8f979f396dea0b21ea45a4d1dde377c58844 100644 (file)
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -30,19 +30,19 @@ remove_strict_flags()
 set(INC
        .
        ../common
-       ../../../../extern/bullet2/src
-       ../../../../intern/moto/include
-       ../../../../intern/guardedalloc
-       ../../../../intern/container
-       ../../../../intern/string
-       ../../Rasterizer
-       ../../Ketsji
        ../../Expressions
        ../../GameLogic
+       ../../Ketsji
+       ../../Rasterizer
        ../../SceneGraph
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenkernel
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/makesdna
+       ../../../../extern/bullet2/src
+       ../../../../intern/container
+       ../../../../intern/guardedalloc
+       ../../../../intern/moto/include
+       ../../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index b705d3151b2e119a1957805aaee247e22fe69722..23d746f88bc83ef409fe50804dfab2015fc1c7cd 100644 (file)
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -26,14 +26,14 @@
 
 set(INC
        .
-       ../../../source/blender/makesdna
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Ketsji
-       ../../../intern/string
+       ../Expressions
+       ../Ketsji
+       ../SceneGraph
+       ../../blender/makesdna
        ../../../intern/container
-       ../../../intern/moto/include
        ../../../intern/guardedalloc
-       ../Expressions
+       ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index a005bb1108d603d4aa46a1ca88fc2569d3f75880..b0ef6fab251d3db9be90bc8fd966df1e2af09a3b 100644 (file)
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -25,18 +25,18 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       ../../../../intern/string
+       ..
+       ../../BlenderRoutines
+       ../../Ketsji
+       ../../SceneGraph
+       ../../../blender/blenkernel
+       ../../../blender/blenlib
+       ../../../blender/blenloader
+       ../../../blender/gpu
+       ../../../blender/makesdna
        ../../../../intern/container
        ../../../../intern/moto/include
-       ../../../../source/gameengine/Rasterizer
-       ../../../../source/gameengine/Ketsji
-       ../../../../source/gameengine/SceneGraph
-       ../../../../source/gameengine/BlenderRoutines
-       ../../../../source/blender/gpu
-       ../../../../source/blender/makesdna
-       ../../../../source/blender/blenkernel
-       ../../../../source/blender/blenlib
-       ../../../../source/blender/blenloader
+       ../../../../intern/string
 )
 
 set(INC_SYS

diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index c412363dc3b7f2eab5ef26dc5e8d5aad0c3d3928..04683a5f99b2498f3847554c716d92be31b97900 100644 (file)
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -26,26 +26,26 @@
 
 set(INC
        .
-       ../../../source/gameengine/Ketsji
-       ../../../source/gameengine/Expressions
-       ../../../source/gameengine/GameLogic
-       ../../../source/gameengine/SceneGraph
-       ../../../source/gameengine/Rasterizer
-       ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
-       ../../../source/gameengine/BlenderRoutines
-       ../../../source/blender/blenlib
-       ../../../source/blender/blenkernel
-       ../../../source/blender/makesdna
-       ../../../source/blender/editors/include
-       ../../../source/blender/imbuf
-       ../../../source/blender/python
-       ../../../source/blender/python/generic
-       ../../../source/blender/gpu
+       ../BlenderRoutines
+       ../Expressions
+       ../GameLogic
+       ../Ketsji
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/editors/include
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/python
+       ../../blender/python/generic
        ../../../intern/container
-       ../../../intern/string
-       ../../../intern/moto/include
-       ../../../intern/guardedalloc
        ../../../intern/ffmpeg
+       ../../../intern/guardedalloc
+       ../../../intern/moto/include
+       ../../../intern/string
 )
 
 set(INC_SYS