From dea59cc5eb6562272df361c062f7ed226c2b7a36 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 18 Sep 2010 03:55:56 +0000 Subject: warning fixes and minor cmake changes. --- source/blender/editors/render/CMakeLists.txt | 9 ++++----- source/blender/editors/screen/CMakeLists.txt | 4 ++-- source/blender/editors/screen/screen_edit.c | 1 + source/blender/editors/sculpt_paint/CMakeLists.txt | 4 ++-- source/blender/editors/sound/CMakeLists.txt | 6 +++--- source/blender/editors/space_action/CMakeLists.txt | 5 ++--- source/blender/editors/space_api/CMakeLists.txt | 4 ++-- source/blender/editors/space_buttons/CMakeLists.txt | 4 ++-- source/blender/editors/space_console/CMakeLists.txt | 4 ++-- source/blender/editors/space_file/CMakeLists.txt | 7 +++---- source/blender/editors/space_graph/CMakeLists.txt | 4 ++-- source/blender/editors/space_image/CMakeLists.txt | 6 +++--- source/blender/editors/space_info/CMakeLists.txt | 4 ++-- source/blender/editors/space_logic/CMakeLists.txt | 4 ++-- source/blender/editors/space_nla/CMakeLists.txt | 4 ++-- source/blender/editors/space_node/CMakeLists.txt | 8 ++++---- source/blender/editors/space_outliner/CMakeLists.txt | 6 +++--- source/blender/editors/space_script/CMakeLists.txt | 6 +++--- source/blender/editors/space_sequencer/CMakeLists.txt | 4 ++-- source/blender/editors/space_sound/CMakeLists.txt | 4 ++-- source/blender/editors/space_text/CMakeLists.txt | 6 +++--- source/blender/editors/space_time/CMakeLists.txt | 4 ++-- source/blender/editors/space_userpref/CMakeLists.txt | 2 +- source/blender/editors/space_view3d/CMakeLists.txt | 8 ++++---- source/blender/editors/transform/CMakeLists.txt | 4 ++-- source/blender/editors/util/CMakeLists.txt | 4 ++-- source/blender/editors/uvedit/CMakeLists.txt | 6 +++--- 27 files changed, 65 insertions(+), 67 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 322e69ca843..d494355a1e9 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -22,24 +22,23 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../gpu ../../imbuf - ../include - ../../../../intern/guardedalloc - ../../../../extern/glew/include ../../makesdna ../../makesrna - ../../python ../../render/extern/include ../../windowmanager + ../../../../intern/guardedalloc + ../../../../extern/glew/include ) IF(WITH_QUICKTIME) - SET(INC ${INC} ../../quicktime ${QUICKTIME_INC}) + LIST(APPEND INC ../../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index b6a8e27449b..f7dfd81dba9 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(WIN32) diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 1ca8bff3193..eb70eef988c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -53,6 +53,7 @@ #include "ED_object.h" #include "ED_screen.h" #include "ED_screen_types.h" +#include "ED_fileselect.h" #include "UI_interface.h" diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index fb8382e10ca..3211763b619 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -22,16 +22,16 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../imbuf ../../gpu ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager ../../render/extern/include + ../../../../intern/guardedalloc ) IF(WIN32) diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 02765726c6e..456c02d947e 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc - ../../../../intern/audaspace/intern ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/audaspace/intern ) BLENDERLIB(bf_editor_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 85275b2db23..3c0585c31ca 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -22,14 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) - BLENDERLIB(bf_editor_space_action "${SRC}" "${INC}") diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 591e97f800f..da140fe0982 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_api "${SRC}" "${INC}") diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index bb50ac0cc86..f8e9536ecf8 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_buttons "${SRC}" "${INC}") diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 0cee45576b8..59074bcbb79 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(NOT WITH_PYTHON) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 207d83b56c6..2a204d67537 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -22,18 +22,17 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../imbuf - ../include - ../../../../intern/audaspace/intern - ../../../../intern/guardedalloc ../../makesdna ../../makesrna - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc ) IF(WITH_IMAGE_OPENEXR) diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 6ad95d920c6..33ddbcea019 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ../../../../intern/audaspace/intern ) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 1c0a97767b7..d47f5a9820e 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc ) IF(WITH_IMAGE_OPENEXR) diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index aa9a40ac98f..9d439c4ec00 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}") diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index 91087d57f11..6f0a260124d 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager ../../editors/interface + ../../../../intern/guardedalloc ) IF(WITH_GAMEENGINE) diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index be8020b0793..6bb656cba8c 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 06dd2257147..ae298a611e9 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -22,17 +22,17 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc - ../../../../intern/opennl/extern ../../makesdna ../../makesrna ../../nodes - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc + ../../../../intern/opennl/extern ) IF(WIN32) diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 78c4fcbdd8d..5ebe47f8c5e 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc - ../../../../intern/opennl/extern ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/opennl/extern ) BLENDERLIB(bf_editor_space_outliner "${SRC}" "${INC}") diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 58b3affe2d4..7abaa4db441 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -22,17 +22,17 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(WITH_PYTHON) - SET(INC ${INC} ${PYTHON_INC} ../../python) + LIST(APPEND INC ${PYTHON_INC} ../../python) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 383cc05b7f7..fa99d35a7cd 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ../../../../intern/audaspace/intern ) diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt index 60c8f5e44bd..c78fc11a908 100644 --- a/source/blender/editors/space_sound/CMakeLists.txt +++ b/source/blender/editors/space_sound/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 0616cf5147a..eabf508b5f6 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -22,18 +22,18 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(WITH_PYTHON) - SET(INC ${INC} ${PYTHON_INC} ../../python) + LIST(APPEND INC ${PYTHON_INC} ../../python) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index 39b7ba355b9..4da42ec1f42 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}") diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index 1752f39cfa5..d57661bb166 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -25,10 +25,10 @@ SET(INC ../include ../../blenkernel ../../blenlib - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index ca9ad001a40..48747898981 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -28,16 +28,16 @@ SET(INC ../../blenlib ../../gpu ../../imbuf - ../../../../intern/guardedalloc - ../../../../intern/smoke/extern ../../makesdna ../../makesrna - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc + ../../../../intern/smoke/extern ) IF(WITH_GAMEENGINE) - SET(INC ${INC} ../../../kernel/gen_system) + LIST(APPEND INC ../../../kernel/gen_system) ADD_DEFINITIONS(-DGAMEBLENDER) ENDIF(WITH_GAMEENGINE) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index e67771270cf..e28ed89c80c 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_transform "${SRC}" "${INC}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index b4b2fd12cef..be700b17b7a 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_util "${SRC}" "${INC}") diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 297863b2a9f..36cd1274ec7 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc - ../../../../intern/opennl/extern ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/opennl/extern ) BLENDERLIB(bf_editor_uvedit "${SRC}" "${INC}") -- cgit v1.2.3