[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37055] branches/soc-2011-onion: merge trunk 37054
Ryakiotakis Antonis
kalast at gmail.com
Tue May 31 20:24:52 CEST 2011
Revision: 37055
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37055
Author: psy-fi
Date: 2011-05-31 18:24:51 +0000 (Tue, 31 May 2011)
Log Message:
-----------
merge trunk 37054
Modified Paths:
--------------
branches/soc-2011-onion/build_files/cmake/macros.cmake
branches/soc-2011-onion/extern/binreloc/CMakeLists.txt
branches/soc-2011-onion/extern/bullet2/CMakeLists.txt
branches/soc-2011-onion/extern/eltopo/CMakeLists.txt
branches/soc-2011-onion/extern/glew/CMakeLists.txt
branches/soc-2011-onion/extern/libopenjpeg/CMakeLists.txt
branches/soc-2011-onion/extern/libredcode/CMakeLists.txt
branches/soc-2011-onion/extern/lzma/CMakeLists.txt
branches/soc-2011-onion/extern/lzo/CMakeLists.txt
branches/soc-2011-onion/intern/audaspace/CMakeLists.txt
branches/soc-2011-onion/intern/boolop/CMakeLists.txt
branches/soc-2011-onion/intern/bsp/CMakeLists.txt
branches/soc-2011-onion/intern/container/CMakeLists.txt
branches/soc-2011-onion/intern/decimation/CMakeLists.txt
branches/soc-2011-onion/intern/elbeem/CMakeLists.txt
branches/soc-2011-onion/intern/ghost/CMakeLists.txt
branches/soc-2011-onion/intern/guardedalloc/CMakeLists.txt
branches/soc-2011-onion/intern/iksolver/CMakeLists.txt
branches/soc-2011-onion/intern/itasc/CMakeLists.txt
branches/soc-2011-onion/intern/memutil/CMakeLists.txt
branches/soc-2011-onion/intern/mikktspace/CMakeLists.txt
branches/soc-2011-onion/intern/moto/CMakeLists.txt
branches/soc-2011-onion/intern/opennl/CMakeLists.txt
branches/soc-2011-onion/intern/smoke/CMakeLists.txt
branches/soc-2011-onion/intern/string/CMakeLists.txt
branches/soc-2011-onion/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-onion/source/blender/avi/CMakeLists.txt
branches/soc-2011-onion/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-onion/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-onion/source/blender/blenkernel/intern/scene.c
branches/soc-2011-onion/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-onion/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-onion/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-onion/source/blender/collada/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-onion/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/interface/interface.c
branches/soc-2011-onion/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-onion/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-onion/source/blender/gpu/CMakeLists.txt
branches/soc-2011-onion/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-onion/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-onion/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-onion/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2011-onion/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-onion/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2011-onion/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-onion/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-onion/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-onion/source/blender/nodes/CMakeLists.txt
branches/soc-2011-onion/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2011-onion/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-onion/source/blender/nodes/intern/SHD_util.h
branches/soc-2011-onion/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-onion/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-onion/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-onion/source/blender/render/CMakeLists.txt
branches/soc-2011-onion/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-onion/source/blender/windowmanager/SConscript
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2011-onion/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-onion/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Network/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2011-onion/source/gameengine/VideoTexture/CMakeLists.txt
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/trunk/blender:36833-37023
+ /branches/soc-2010-jwilkins:28499-37009
/trunk/blender:36833-37054
Modified: branches/soc-2011-onion/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-05-31 18:24:51 UTC (rev 37055)
@@ -13,7 +13,16 @@
include_directories(${all_incs})
endmacro()
+macro(blender_include_dirs_sys
+ includes)
+ foreach(inc ${ARGV})
+ get_filename_component(abs_inc ${inc} ABSOLUTE)
+ list(APPEND all_incs ${abs_inc})
+ endforeach()
+ include_directories(SYSTEM ${all_incs})
+endmacro()
+
macro(blender_source_group
sources)
@@ -35,12 +44,15 @@
macro(blender_add_lib_nolist
name
sources
- includes)
+ includes
+ includes_sys)
# message(STATUS "Configuring library ${name}")
# include_directories(${includes})
+ # include_directories(SYSTEM ${includes_sys})
blender_include_dirs("${includes}")
+ blender_include_dirs_sys("${includes_sys}")
add_library(${name} ${sources})
@@ -54,9 +66,10 @@
macro(blender_add_lib
name
sources
- includes)
+ includes
+ includes_sys)
- blender_add_lib_nolist(${name} "${sources}" "${includes}")
+ blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
endmacro()
Modified: branches/soc-2011-onion/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/binreloc/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/binreloc/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -18,17 +18,21 @@
# All rights reserved.
#
+set(INC
+ ./include
+)
+
+set(INC_SYS
+
+)
+
set(SRC
binreloc.c
include/binreloc.h
)
-set(INC
- ./include
-)
-
add_definitions(-DENABLE_BINRELOC)
-blender_add_lib(extern_binreloc "${SRC}" "${INC}")
+blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/bullet2/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/bullet2/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -29,6 +29,10 @@
src
)
+set(INC_SYS
+
+)
+
set(SRC
src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
@@ -145,7 +149,6 @@
src/LinearMath/btGeometryUtil.cpp
src/LinearMath/btQuickprof.cpp
src/LinearMath/btSerializer.cpp
-
src/Bullet-C-Api.h
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -330,4 +333,4 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
endif()
-blender_add_lib(extern_bullet "${SRC}" "${INC}")
+blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/eltopo/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/eltopo/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -33,6 +33,10 @@
eltopo3d
)
+set(INC_SYS
+
+)
+
set(SRC
eltopo-capi.cpp
common/bfstream.cpp
@@ -122,4 +126,4 @@
add_definitions(-DNOGUI)
add_definitions(-DUSE_FORTRAN_BLAS)
-blender_add_lib(extern_eltopo "${SRC}" "${INC}")
+blender_add_lib(extern_eltopo "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/glew/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/glew/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -28,8 +28,12 @@
./include
)
+set(INC_SYS
+
+)
+
if(UNIX)
- list(APPEND INC ${X11_X11_INCLUDE_PATH})
+ list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
endif()
set(SRC
@@ -42,4 +46,4 @@
add_definitions(-DGLEW_STATIC)
-blender_add_lib(extern_glew "${SRC}" "${INC}")
+blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/extern/libopenjpeg/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/libopenjpeg/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/libopenjpeg/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -28,6 +28,10 @@
.
)
+set(INC_SYS
+
+)
+
set(SRC
bio.c
cio.c
@@ -73,4 +77,4 @@
tgt.h
)
-blender_add_lib(extern_openjpeg "${SRC}" "${INC}")
+blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/extern/libredcode/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/libredcode/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/libredcode/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -26,6 +26,9 @@
set(INC
.
+)
+
+set(INC_SYS
../libopenjpeg
)
@@ -39,4 +42,4 @@
format.h
)
-blender_add_lib(extern_redcode "${SRC}" "${INC}")
+blender_add_lib(extern_redcode "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/extern/lzma/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/lzma/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/lzma/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -28,6 +28,10 @@
.
)
+set(INC_SYS
+
+)
+
set(SRC
Alloc.c
LzFind.c
@@ -44,4 +48,4 @@
Types.h
)
-blender_add_lib(extern_lzma "${SRC}" "${INC}")
+blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/extern/lzo/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/extern/lzo/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/extern/lzo/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -28,6 +28,10 @@
include
)
+set(INC_SYS
+
+)
+
set(SRC
minilzo/minilzo.c
@@ -36,4 +40,4 @@
minilzo/minilzo.h
)
-blender_add_lib(extern_minilzo "${SRC}" "${INC}")
+blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/intern/audaspace/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/intern/audaspace/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -23,12 +23,15 @@
set(INC
.
intern
- FX SRC
- ${PTHREADS_INC}
- ${LIBSAMPLERATE_INC}
+ FX
+ SRC
../ffmpeg
)
+set(INC_SYS
+ ${PTHREADS_INC}
+)
+
set(SRC
FX/AUD_AccumulatorFactory.cpp
FX/AUD_BaseIIRFilterReader.cpp
@@ -156,8 +159,9 @@
if(WITH_CODEC_FFMPEG)
add_definitions(-DWITH_FFMPEG)
- list(APPEND INC ffmpeg ${FFMPEG_INC})
- set(FFMPEGSRC
+ list(APPEND INC ffmpeg)
+ list(APPEND INC_SYS ${FFMPEG_INC})
+ list(APPEND SRC
ffmpeg/AUD_FFMPEGFactory.cpp
ffmpeg/AUD_FFMPEGReader.cpp
@@ -168,8 +172,9 @@
if(WITH_SDL)
add_definitions(-DWITH_SDL)
- list(APPEND INC SDL ${SDL_INCLUDE_DIR})
- set(SDLSRC
+ list(APPEND INC SDL)
+ list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+ list(APPEND SRC
SDL/AUD_SDLDevice.cpp
SDL/AUD_SDLDevice.h
@@ -178,18 +183,20 @@
if(WITH_OPENAL)
add_definitions(-DWITH_OPENAL)
- list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
- set(OPENALSRC
+ list(APPEND INC OpenAL)
+ list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR})
+ list(APPEND SRC
OpenAL/AUD_OpenALDevice.cpp
OpenAL/AUD_OpenALDevice.h
- )
+ )
endif()
if(WITH_JACK)
add_definitions(-DWITH_JACK)
- list(APPEND INC jack ${JACK_INC})
- set(JACKSRC
+ list(APPEND INC jack)
+ list(APPEND INC_SYS ${JACK_INC})
+ list(APPEND SRC
jack/AUD_JackDevice.cpp
jack/AUD_JackDevice.h
@@ -198,8 +205,9 @@
if(WITH_CODEC_SNDFILE)
add_definitions(-DWITH_SNDFILE)
- list(APPEND INC sndfile ${SNDFILE_INC})
- set(SNDFILESRC
+ list(APPEND INC sndfile)
+ list(APPEND INC_SYS ${SNDFILE_INC})
+ list(APPEND SRC
sndfile/AUD_SndFileFactory.cpp
sndfile/AUD_SndFileReader.cpp
@@ -210,7 +218,8 @@
if(WITH_SAMPLERATE)
add_definitions(-DWITH_SAMPLERATE)
- set(SRCFILESRC
+ list(APPEND INC_SYS ${LIBSAMPLERATE_INC})
+ list(APPEND SRC
SRC/AUD_SRCResampleFactory.cpp
SRC/AUD_SRCResampleReader.cpp
@@ -221,8 +230,9 @@
if(WITH_FFTW3 AND FALSE)
add_definitions(-DWITH_FFTW3)
- list(APPEND INC fftw ${FFTW3_INC})
- set(FFTW3SRC
+ list(APPEND INC fftw)
+ list(APPEND INC_SYS ${FFTW3_INC})
+ list(APPEND SRC
fftw/AUD_BandPassFactory.cpp
fftw/AUD_BandPassReader.cpp
@@ -232,8 +242,9 @@
endif()
if(WITH_PYTHON)
- list(APPEND INC Python ${PYTHON_INCLUDE_DIRS})
- set(PYTHONSRC
+ list(APPEND INC Python)
+ list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+ list(APPEND SRC
Python/AUD_PyAPI.cpp
Python/AUD_PyAPI.h
@@ -241,16 +252,4 @@
add_definitions(-DWITH_PYTHON)
endif()
-set(SRC
- ${SRC}
- ${FFMPEGSRC}
- ${SNDFILESRC}
- ${SRCFILESRC}
- ${FFTW3SRC}
- ${SDLSRC}
- ${OPENALSRC}
- ${JACKSRC}
- ${PYTHONSRC}
-)
-
-blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}")
+blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/intern/boolop/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/intern/boolop/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/intern/boolop/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -36,6 +36,10 @@
../../source/blender/makesdna
)
+set(INC_SYS
+
+)
+
set(SRC
intern/BOP_BBox.cpp
intern/BOP_BSPNode.cpp
@@ -75,4 +79,4 @@
intern/BOP_Vertex.h
)
-blender_add_lib(bf_intern_bop "${SRC}" "${INC}")
+blender_add_lib(bf_intern_bop "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2011-onion/intern/bsp/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/intern/bsp/CMakeLists.txt 2011-05-31 17:54:48 UTC (rev 37054)
+++ branches/soc-2011-onion/intern/bsp/CMakeLists.txt 2011-05-31 18:24:51 UTC (rev 37055)
@@ -32,6 +32,10 @@
../memutil
)
+set(INC_SYS
+
+)
+
set(SRC
intern/BSP_CSGMesh.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list