Revision: 38443
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38443
Author: campbellbarton
Date: 2011-07-17 09:11:13 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
cmake: cleanup include paths, some duplicates and going up some unneeded dirs.
Modified Paths:
--------------
trunk/blender/extern/binreloc/CMakeLists.txt
trunk/blender/extern/eltopo/CMakeLists.txt
trunk/blender/extern/glew/CMakeLists.txt
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/boolop/CMakeLists.txt
trunk/blender/intern/bsp/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/source/blender/avi/CMakeLists.txt
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/curve/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/metaball/CMakeLists.txt
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_action/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/CMakeLists.txt
trunk/blender/source/blender/editors/space_userpref/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/uvedit/CMakeLists.txt
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/ikplugin/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/python/generic/CMakeLists.txt
trunk/blender/source/blender/python/intern/CMakeLists.txt
trunk/blender/source/blender/quicktime/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Expressions/CMakeLists.txt
trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Network/CMakeLists.txt
trunk/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
Modified: trunk/blender/extern/binreloc/CMakeLists.txt
===================================================================
--- trunk/blender/extern/binreloc/CMakeLists.txt 2011-07-17 08:38:04 UTC
(rev 38442)
+++ trunk/blender/extern/binreloc/CMakeLists.txt 2011-07-17 09:11:13 UTC
(rev 38443)
@@ -19,7 +19,7 @@
#
set(INC
- ./include
+ include
)
set(INC_SYS
Modified: trunk/blender/extern/eltopo/CMakeLists.txt
===================================================================
--- trunk/blender/extern/eltopo/CMakeLists.txt 2011-07-17 08:38:04 UTC (rev
38442)
+++ trunk/blender/extern/eltopo/CMakeLists.txt 2011-07-17 09:11:13 UTC (rev
38443)
@@ -27,10 +27,10 @@
set(INC
.
common
+ eltopo3d
+ common/meshes
common/newsparse
common/tunicate
- common/meshes
- eltopo3d
)
set(INC_SYS
@@ -51,11 +51,19 @@
common/makelevelset2.cpp
common/makelevelset3.cpp
common/marching_triangles.cpp
+ common/predicates.cpp
+ common/sos_ccd_wrapper.cpp
+ common/wallclocktime.cpp
+ eltopo3d/accelerationgrid.cpp
+ eltopo3d/broadphasegrid.cpp
+ eltopo3d/dynamicsurface.cpp
+ eltopo3d/eltopo.cpp
+ eltopo3d/nondestructivetrimesh.cpp
+ eltopo3d/subdivisionscheme.cpp
+ eltopo3d/surftrack.cpp
common/newsparse/dense_matrix.cpp
common/newsparse/krylov_solvers.cpp
common/newsparse/sparse_matrix.cpp
- common/predicates.cpp
- common/sos_ccd_wrapper.cpp
common/sparse/incomplete_qr.cpp
common/tunicate/expansion.cpp
common/tunicate/intersection.cpp
@@ -63,14 +71,6 @@
common/tunicate/orientation.cpp
common/tunicate/sos_intersection.cpp
common/tunicate/sos_orientation.cpp
- common/wallclocktime.cpp
- eltopo3d/accelerationgrid.cpp
- eltopo3d/broadphasegrid.cpp
- eltopo3d/dynamicsurface.cpp
- eltopo3d/eltopo.cpp
- eltopo3d/nondestructivetrimesh.cpp
- eltopo3d/subdivisionscheme.cpp
- eltopo3d/surftrack.cpp
eltopo-capi.h
common/array1.h
@@ -93,21 +93,8 @@
common/marching_triangles.h
common/mat.h
common/matlapack.h
- common/newsparse/dense_matrix.h
- common/newsparse/krylov_solvers.h
- common/newsparse/linear_operator.h
- common/newsparse/sparse_matrix.h
common/openglutils.h
common/predicates.h
- common/sparse/cgsolver.h
- common/sparse/crsolver.h
- common/sparse/incomplete_qr.h
- common/sparse/sparseilu.h
- common/sparse/sparsematrix.h
- common/sparse/sparsemilu.h
- common/tunicate/expansion.h
- common/tunicate/neg.h
- common/tunicate/tunicate.h
common/util.h
common/vec.h
common/vector_math.h
@@ -121,6 +108,19 @@
eltopo3d/options.h
eltopo3d/subdivisionscheme.h
eltopo3d/surftrack.h
+ common/newsparse/dense_matrix.h
+ common/newsparse/krylov_solvers.h
+ common/newsparse/linear_operator.h
+ common/newsparse/sparse_matrix.h
+ common/sparse/cgsolver.h
+ common/sparse/crsolver.h
+ common/sparse/incomplete_qr.h
+ common/sparse/sparseilu.h
+ common/sparse/sparsematrix.h
+ common/sparse/sparsemilu.h
+ common/tunicate/expansion.h
+ common/tunicate/neg.h
+ common/tunicate/tunicate.h
)
add_definitions(-DNOGUI)
Modified: trunk/blender/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt 2011-07-17 08:38:04 UTC (rev
38442)
+++ trunk/blender/extern/glew/CMakeLists.txt 2011-07-17 09:11:13 UTC (rev
38443)
@@ -25,7 +25,7 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- ./include
+ include
)
set(INC_SYS
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-07-17 08:38:04 UTC
(rev 38442)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-07-17 09:11:13 UTC
(rev 38443)
@@ -22,9 +22,9 @@
set(INC
.
- intern
FX
SRC
+ intern
../ffmpeg
)
Modified: trunk/blender/intern/boolop/CMakeLists.txt
===================================================================
--- trunk/blender/intern/boolop/CMakeLists.txt 2011-07-17 08:38:04 UTC (rev
38442)
+++ trunk/blender/intern/boolop/CMakeLists.txt 2011-07-17 09:11:13 UTC (rev
38443)
@@ -26,11 +26,11 @@
set(INC
.
- ./intern
- ./extern
- ../memutil
+ extern
+ intern
../container
../guardedalloc
+ ../memutil
../moto/include
../../source/blender/blenlib
../../source/blender/makesdna
Modified: trunk/blender/intern/bsp/CMakeLists.txt
===================================================================
--- trunk/blender/intern/bsp/CMakeLists.txt 2011-07-17 08:38:04 UTC (rev
38442)
+++ trunk/blender/intern/bsp/CMakeLists.txt 2011-07-17 09:11:13 UTC (rev
38443)
@@ -25,11 +25,11 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- ./intern
+ intern
../container
../guardedalloc
+ ../memutil
../moto/include
- ../memutil
)
set(INC_SYS
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2011-07-17 08:38:04 UTC (rev
38442)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2011-07-17 09:11:13 UTC (rev
38443)
@@ -37,9 +37,8 @@
set(SRC
intern/GHOST_Buttons.cpp
+ intern/GHOST_C-api.cpp
intern/GHOST_CallbackEventConsumer.cpp
- intern/GHOST_C-api.cpp
- intern/GHOST_Path-api.cpp
intern/GHOST_DisplayManager.cpp
intern/GHOST_EventManager.cpp
intern/GHOST_ISystem.cpp
@@ -47,6 +46,7 @@
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 @@
GHOST_Path-api.h
GHOST_Rect.h
GHOST_Types.h
+
intern/GHOST_Buttons.h
intern/GHOST_CallbackEventConsumer.h
intern/GHOST_Debug.h
Modified: trunk/blender/source/blender/avi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/avi/CMakeLists.txt 2011-07-17 08:38:04 UTC
(rev 38442)
+++ trunk/blender/source/blender/avi/CMakeLists.txt 2011-07-17 09:11:13 UTC
(rev 38443)
@@ -26,8 +26,8 @@
set(INC
.
+ ../blenlib
../../../intern/guardedalloc
- ../blenlib
)
set(INC_SYS
Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-07-17
08:38:04 UTC (rev 38442)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-07-17
09:11:13 UTC (rev 38443)
@@ -24,10 +24,10 @@
set(INC
.
+ ../blenkernel
../blenlib
+ ../editors/include
../makesdna
- ../editors/include
- ../blenkernel
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-07-17
08:38:04 UTC (rev 38442)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-07-17
09:11:13 UTC (rev 38443)
@@ -55,7 +55,7 @@
../../../intern/smoke/extern
# XXX - BAD LEVEL CALL WM_api.h
- ../../../source/blender/windowmanager
+ ../windowmanager
)
set(INC_SYS
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-07-17 08:38:04 UTC
(rev 38442)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-07-17 09:11:13 UTC
(rev 38443)
@@ -26,10 +26,10 @@
set(INC
.
- ../makesdna
../blenkernel
../blenloader
../gpu
+ ../makesdna
../../../intern/ghost
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/blenloader/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenloader/CMakeLists.txt 2011-07-17
08:38:04 UTC (rev 38442)
+++ trunk/blender/source/blender/blenloader/CMakeLists.txt 2011-07-17
09:11:13 UTC (rev 38443)
@@ -26,8 +26,8 @@
set(INC
.
+ ../blenkernel
../blenlib
- ../blenkernel
../makesdna
../makesrna
../render/extern/include
Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2011-07-17
08:38:04 UTC (rev 38442)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2011-07-17
09:11:13 UTC (rev 38443)
@@ -28,9 +28,9 @@
.
..
../blenlib
+ ../blenloader
../imbuf
../makesdna
- ../blenloader
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/collada/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/collada/CMakeLists.txt 2011-07-17 08:38:04 UTC
(rev 38442)
+++ trunk/blender/source/blender/collada/CMakeLists.txt 2011-07-17 09:11:13 UTC
(rev 38443)
@@ -28,13 +28,13 @@
set(INC
.
+ ../blenkernel
../blenlib
- ../blenkernel
../blenloader
- ../windowmanager
+ ../editors/include
../makesdna
../makesrna
- ../editors/include
+ ../windowmanager
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/editors/animation/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/animation/CMakeLists.txt
2011-07-17 08:38:04 UTC (rev 38442)
+++ trunk/blender/source/blender/editors/animation/CMakeLists.txt
2011-07-17 09:11:13 UTC (rev 38443)
@@ -22,8 +22,8 @@
set(INC
../include
../../blenkernel
+ ../../blenlib
../../blenloader
- ../../blenlib
../../makesdna
../../makesrna
../../windowmanager
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt
2011-07-17 08:38:04 UTC (rev 38442)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt
2011-07-17 09:11:13 UTC (rev 38443)
@@ -22,8 +22,8 @@
set(INC
../include
../../blenkernel
+ ../../blenlib
../../blenloader
- ../../blenlib
../../makesdna
../../makesrna
../../windowmanager
Modified: trunk/blender/source/blender/editors/curve/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/curve/CMakeLists.txt 2011-07-17
08:38:04 UTC (rev 38442)
+++ trunk/blender/source/blender/editors/curve/CMakeLists.txt 2011-07-17
09:11:13 UTC (rev 38443)
@@ -22,8 +22,8 @@
set(INC
../include
../../blenkernel
+ ../../blenlib
../../blenloader
- ../../blenlib
../../makesdna
../../makesrna
../../windowmanager
Modified: trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
