tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

warning fixes and minor cmake changes.

This commit is contained in:
Campbell Barton 2010-09-18 03:55:56 +00:00
parent d5e11d409f
commit dea59cc5eb
52 changed files with 174 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extern/binreloc/CMakeLists.txt vendored
View File

@ -18,8 +18,15 @@
# All rights reserved.
#
SET(INC ./include )
SET(SRC
binreloc.c
)
SET(INC
./include
)
ADD_DEFINITIONS(-DENABLE_BINRELOC)
FILE(GLOB SRC *.c)
BLENDERLIB(extern_binreloc "${SRC}" "${INC}")

4
extern/glew/CMakeLists.txt vendored
View File

@ -24,7 +24,9 @@
#
# ***** END GPL LICENSE BLOCK *****
SET(INC include src)
SET(INC
./include
)
IF(UNIX)
LIST(APPEND INC ${X11_X11_INCLUDE_PATH})

6
extern/lzo/CMakeLists.txt vendored
View File

@ -25,10 +25,6 @@
# ***** END GPL LICENSE BLOCK *****
SET(INC include)
FILE(GLOB SRC minilzo/*.c)
SET(SRC minilzo/minilzo.c)
BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
#, libtype='blender', priority = 0 )

13
intern/boolop/CMakeLists.txt
View File

@ -24,9 +24,18 @@
#
# ***** END GPL LICENSE BLOCK *****
SET(INC . intern extern ../moto/include ../container ../memutil ../../source/blender/makesdna ../guardedalloc ../../source/blender/blenlib)
SET(INC
.
./intern
./extern
../memutil
../container
../guardedalloc
../moto/include
../../source/blender/blenlib
../../source/blender/makesdna
)
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
#, libtype='common', priority=5 )

8
intern/bsp/CMakeLists.txt
View File

@ -24,9 +24,13 @@
#
# ***** END GPL LICENSE BLOCK *****
SET(INC intern ../container ../moto/include ../memutil)
SET(INC
./intern
../container
../moto/include
../memutil
)
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
#, libtype='core', priority=15 )

1
intern/container/CMakeLists.txt
View File

@ -29,4 +29,3 @@ SET(INC .)
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
#, libtype=['intern'], priority = 10 )

8
intern/decimation/CMakeLists.txt
View File

@ -24,9 +24,13 @@
#
# ***** END GPL LICENSE BLOCK *****
SET(INC . ../moto/include ../container ../memutil)
SET(INC
.
../container
../memutil
../moto/include
)
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
#, libtype=['core','common','player'], priority = [10, 20, 25] )

1
intern/elbeem/CMakeLists.txt
View File

@ -38,4 +38,3 @@ IF(WITH_OPENMP)
ENDIF(WITH_OPENMP)
BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
#, libtype='blender', priority=0 )

12
intern/guardedalloc/CMakeLists.txt
View File

@ -26,12 +26,18 @@
SET(INC .)
FILE(GLOB SRC intern/*.c)
SET(SRC
./intern/mallocn.c
)
IF(WIN32)
LIST(APPEND SRC ./intern/mmap_win.c)
ENDIF(WIN32)
BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}")
# Override C++ alloc optional
# Override C++ alloc, optional.
IF(WITH_CXX_GUARDEDALLOC)
FILE(GLOB SRC cpp/*.cpp)
SET(SRC cpp/mallocn.cpp)
BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
ENDIF(WITH_CXX_GUARDEDALLOC)

7
intern/iksolver/CMakeLists.txt
View File

@ -24,9 +24,12 @@
#
# ***** END GPL LICENSE BLOCK *****
SET(INC intern ../moto/include ../memutil)
SET(INC
intern
../memutil
../moto/include
)
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_ik "${SRC}" "${INC}")
#, libtype=['blender'], priority = [10] )

1
intern/itasc/CMakeLists.txt
View File

@ -29,4 +29,3 @@ SET(INC ../../extern/Eigen2)
FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp)
BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
#, libtype=['blender'], priority = [10] )

6
intern/memutil/CMakeLists.txt
View File

@ -26,7 +26,9 @@
SET(INC . ..)
FILE(GLOB SRC intern/*.cpp)
SET(SRC
./intern/MEM_CacheLimiterC-Api.cpp
./intern/MEM_RefCountedC-Api.cpp
)
BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}")
#, libtype=['intern', 'player'], priority = [0, 180] )

1
intern/moto/CMakeLists.txt
View File

@ -29,4 +29,3 @@ SET(INC include)
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_moto "${SRC}" "${INC}")
#, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )

2
intern/opennl/CMakeLists.txt
View File

@ -29,5 +29,3 @@ SET(INC extern superlu)
FILE(GLOB SRC intern/*.c superlu/*.c)
BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
#, libtype='core', priority=55 )

4
intern/string/CMakeLists.txt
View File

@ -25,8 +25,6 @@
# ***** END GPL LICENSE BLOCK *****
SET(INC .)
FILE(GLOB SRC intern/*.cpp)
SET(SRC ./intern/STR_String.cpp)
BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
#, libtype=['core', 'player'], priority = [30,10] )

2
source/blender/blenkernel/CMakeLists.txt
View File

@ -31,7 +31,6 @@ SET(INC
../avi
../blenlib
../blenloader
../editors/include
../gpu
../ikplugin
../imbuf
@ -39,6 +38,7 @@ SET(INC
../makesrna
../modifiers
../nodes
../editors/include
../render/extern/include
../../../extern/glew/include
../../../intern/audaspace/intern

1
source/blender/blenkernel/intern/effect.c
View File

@ -86,7 +86,6 @@
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
#include "BKE_utildefines.h"
#include "RE_render_ext.h"

11
source/blender/blenloader/CMakeLists.txt
View File

@ -27,10 +27,15 @@
FILE(GLOB SRC intern/*.c)
SET(INC
. ../../../intern/guardedalloc ../blenlib ../blenkernel
../makesdna ../readblenfile ../include ../makesrna
../python ../../kernel/gen_messaging
.
../blenlib
../blenkernel
../makesdna
../readblenfile
../include
../makesrna
../render/extern/include
../../../intern/guardedalloc
${ZLIB_INC}
)

7
source/blender/blenpluginapi/CMakeLists.txt
View File

@ -27,7 +27,12 @@
FILE(GLOB SRC intern/*.c)
SET(INC
. .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
.
..
../blenlib
../imbuf
../makesdna
../../../intern/guardedalloc
)
IF(WIN32)

9
source/blender/editors/render/CMakeLists.txt
View File

@ -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)

4
source/blender/editors/screen/CMakeLists.txt
View File

@ -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)

1
source/blender/editors/screen/screen_edit.c
View File

@ -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"

4
source/blender/editors/sculpt_paint/CMakeLists.txt
View File

@ -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)

6
source/blender/editors/sound/CMakeLists.txt
View File

@ -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}")

5
source/blender/editors/space_action/CMakeLists.txt
View File

@ -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}")

4
source/blender/editors/space_api/CMakeLists.txt
View File

@ -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}")

4
source/blender/editors/space_buttons/CMakeLists.txt
View File

@ -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}")

4
source/blender/editors/space_console/CMakeLists.txt
View File

@ -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)

7
source/blender/editors/space_file/CMakeLists.txt
View File

@ -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)

4
source/blender/editors/space_graph/CMakeLists.txt
View File

@ -22,13 +22,13 @@
FILE(GLOB SRC *.c)
SET(INC
../include
../../blenkernel
../../blenlib
../include
../../../../intern/guardedalloc
../../makesdna
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/audaspace/intern
)

6
source/blender/editors/space_image/CMakeLists.txt
View File

@ -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)

4
source/blender/editors/space_info/CMakeLists.txt
View File

@ -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}")

4
source/blender/editors/space_logic/CMakeLists.txt
View File

@ -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)

4
source/blender/editors/space_nla/CMakeLists.txt
View File

@ -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}")

8
source/blender/editors/space_node/CMakeLists.txt
View File

@ -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)

6
source/blender/editors/space_outliner/CMakeLists.txt
View File

@ -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}")

6
source/blender/editors/space_script/CMakeLists.txt
View File

@ -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)

4
source/blender/editors/space_sequencer/CMakeLists.txt
View File

@ -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
)

4
source/blender/editors/space_sound/CMakeLists.txt
View File

@ -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}")

6
source/blender/editors/space_text/CMakeLists.txt
View File

@ -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)

4
source/blender/editors/space_time/CMakeLists.txt
View File

@ -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}")

2
source/blender/editors/space_userpref/CMakeLists.txt
View File

@ -25,10 +25,10 @@ SET(INC
../include
../../blenkernel
../../blenlib
../../../../intern/guardedalloc
../../makesdna
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}")

8
source/blender/editors/space_view3d/CMakeLists.txt
View File

@ -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)

4
source/blender/editors/transform/CMakeLists.txt
View File

@ -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}")

4
source/blender/editors/util/CMakeLists.txt
View File

@ -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}")

6
source/blender/editors/uvedit/CMakeLists.txt
View File

@ -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}")

15
source/blender/gpu/CMakeLists.txt
View File

@ -26,9 +26,18 @@
FILE(GLOB SRC intern/*.c)
SET(INC
. ../blenlib ../blenkernel ../makesdna ../makesrna ../include
../../../extern/glew/include ../../../intern/guardedalloc ../../../intern/smoke/extern ../imbuf)
SET(INC
.
../blenlib
../blenkernel
../include
../imbuf
../makesdna
../makesrna
../../../extern/glew/include
../../../intern/guardedalloc
../../../intern/smoke/extern
)
IF(WIN32)
INCLUDE_DIRECTORIES(${PTHREADS_INC})

8
source/blender/imbuf/CMakeLists.txt
View File

@ -29,12 +29,12 @@ FILE(GLOB SRC intern/*.c)
SET(INC
.
../makesdna
../../../intern/guardedalloc
../../../intern/memutil
../blenlib
../avi
../blenlib
../blenkernel
../makesdna
../../../intern/memutil
../../../intern/guardedalloc
${JPEG_INC}
${PNG_INC}
${ZLIB_INC}

8
source/blender/imbuf/intern/cineon/CMakeLists.txt
View File

@ -28,13 +28,13 @@ FILE(GLOB SRC *.c)
SET(INC
.
../../../blenkernel
../../
..
../../../blenlib
../../
intern/include
../../../../../intern/guardedalloc
../../../blenkernel
../../../blenlib
../../../makesdna
../../../../../intern/guardedalloc
)
BLENDERLIB(bf_cineon "${SRC}" "${INC}")

8
source/blender/imbuf/intern/dds/CMakeLists.txt
View File

@ -28,12 +28,12 @@ FILE (GLOB SRC *.cpp)
SET(INC
.
..
./intern/include
../../
../../../blenlib
../../../blenkernel
../../../makesdna
../../
..
../../../blenlib
intern/include
../../../../../intern/guardedalloc
)

10
source/blender/makesdna/intern/CMakeLists.txt
View File

@ -28,7 +28,15 @@ INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..)
FILE(GLOB INC_FILES ../*.h)
# Build makesdna executable
SET(SRC makesdna.c ../../../../intern/guardedalloc/intern/mallocn.c ../../../../intern/guardedalloc/intern/mmap_win.c)
SET(SRC
makesdna.c
../../../../intern/guardedalloc/intern/mallocn.c
)
IF(WIN32)
LIST(APPEND SRC ../../../../intern/guardedalloc/intern/mmap_win.c)
ENDIF(WIN32)
ADD_EXECUTABLE(makesdna ${SRC} ${INC_FILES})
# Output dna.c

9
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -1232,11 +1232,14 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa
/* remlink now, for load file case before removing*/
BLI_remlink(handlers, handler);
if(event->val!=EVT_FILESELECT_EXTERNAL_CANCEL)
if(screen != handler->filescreen)
if(event->val!=EVT_FILESELECT_EXTERNAL_CANCEL) {
if(screen != handler->filescreen) {
ED_screen_full_prevspace(C, CTX_wm_area(C));
else
}
else {
ED_area_prevspace(C, CTX_wm_area(C));
}
}
wm_handler_op_context(C, handler);