[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31991] trunk/blender: warning fixes and minor cmake changes.
Campbell Barton
ideasman42 at gmail.com
Sat Sep 18 05:55:56 CEST 2010
Revision: 31991
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31991
Author: campbellbarton
Date: 2010-09-18 05:55:56 +0200 (Sat, 18 Sep 2010)
Log Message:
-----------
warning fixes and minor cmake changes.
Modified Paths:
--------------
trunk/blender/extern/binreloc/CMakeLists.txt
trunk/blender/extern/glew/CMakeLists.txt
trunk/blender/extern/lzo/CMakeLists.txt
trunk/blender/intern/boolop/CMakeLists.txt
trunk/blender/intern/bsp/CMakeLists.txt
trunk/blender/intern/container/CMakeLists.txt
trunk/blender/intern/decimation/CMakeLists.txt
trunk/blender/intern/elbeem/CMakeLists.txt
trunk/blender/intern/guardedalloc/CMakeLists.txt
trunk/blender/intern/iksolver/CMakeLists.txt
trunk/blender/intern/itasc/CMakeLists.txt
trunk/blender/intern/memutil/CMakeLists.txt
trunk/blender/intern/moto/CMakeLists.txt
trunk/blender/intern/opennl/CMakeLists.txt
trunk/blender/intern/string/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/screen/screen_edit.c
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_console/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/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/makesdna/intern/CMakeLists.txt
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/extern/binreloc/CMakeLists.txt
===================================================================
--- trunk/blender/extern/binreloc/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/extern/binreloc/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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}")
Modified: trunk/blender/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/extern/glew/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -24,7 +24,9 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC include src)
+SET(INC
+ ./include
+)
IF(UNIX)
LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
Modified: trunk/blender/extern/lzo/CMakeLists.txt
===================================================================
--- trunk/blender/extern/lzo/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/extern/lzo/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -25,10 +25,6 @@
# ***** END GPL LICENSE BLOCK *****
SET(INC include)
+SET(SRC minilzo/minilzo.c)
-FILE(GLOB SRC minilzo/*.c)
-
-
-
BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
Modified: trunk/blender/intern/boolop/CMakeLists.txt
===================================================================
--- trunk/blender/intern/boolop/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/boolop/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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 )
Modified: trunk/blender/intern/bsp/CMakeLists.txt
===================================================================
--- trunk/blender/intern/bsp/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/bsp/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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 )
Modified: trunk/blender/intern/container/CMakeLists.txt
===================================================================
--- trunk/blender/intern/container/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/container/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -29,4 +29,3 @@
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
-#, libtype=['intern'], priority = 10 )
Modified: trunk/blender/intern/decimation/CMakeLists.txt
===================================================================
--- trunk/blender/intern/decimation/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/decimation/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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] )
Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/elbeem/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -38,4 +38,3 @@
ENDIF(WITH_OPENMP)
BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
-#, libtype='blender', priority=0 )
Modified: trunk/blender/intern/guardedalloc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/guardedalloc/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/guardedalloc/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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)
Modified: trunk/blender/intern/iksolver/CMakeLists.txt
===================================================================
--- trunk/blender/intern/iksolver/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/iksolver/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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] )
Modified: trunk/blender/intern/itasc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/itasc/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/itasc/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -29,4 +29,3 @@
FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp)
BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
-#, libtype=['blender'], priority = [10] )
Modified: trunk/blender/intern/memutil/CMakeLists.txt
===================================================================
--- trunk/blender/intern/memutil/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/memutil/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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] )
Modified: trunk/blender/intern/moto/CMakeLists.txt
===================================================================
--- trunk/blender/intern/moto/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/moto/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -29,4 +29,3 @@
FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_intern_moto "${SRC}" "${INC}")
-#, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )
Modified: trunk/blender/intern/opennl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/opennl/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/opennl/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -29,5 +29,3 @@
FILE(GLOB SRC intern/*.c superlu/*.c)
BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
-#, libtype='core', priority=55 )
-
Modified: trunk/blender/intern/string/CMakeLists.txt
===================================================================
--- trunk/blender/intern/string/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/intern/string/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -25,8 +25,6 @@
# ***** END GPL LICENSE BLOCK *****
SET(INC .)
+SET(SRC ./intern/STR_String.cpp)
-FILE(GLOB SRC intern/*.cpp)
-
BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
-#, libtype=['core', 'player'], priority = [30,10] )
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -31,7 +31,6 @@
../avi
../blenlib
../blenloader
- ../editors/include
../gpu
../ikplugin
../imbuf
@@ -39,6 +38,7 @@
../makesrna
../modifiers
../nodes
+ ../editors/include
../render/extern/include
../../../extern/glew/include
../../../intern/audaspace/intern
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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"
Modified: trunk/blender/source/blender/blenloader/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenloader/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/source/blender/blenloader/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -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}
)
Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-09-18 03:46:13 UTC (rev 31990)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2010-09-18 03:55:56 UTC (rev 31991)
@@ -27,7 +27,12 @@
FILE(GLOB SRC intern/*.c)
SET(INC
- . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
+ .
+ ..
+ ../blenlib
+ ../imbuf
+ ../makesdna
+ ../../../intern/guardedalloc
)
IF(WIN32)
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list