[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39685] branches/soc-2011-cucumber: Merge from trunk r39684

Daniel Stokes kupomail at gmail.com
Thu Aug 25 01:26:14 CEST 2011 

Revision: 39685
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39685
Author:   kupoman
Date:     2011-08-24 23:26:14 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Merge from trunk r39684

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39684

Modified Paths:
--------------
    branches/soc-2011-cucumber/CMakeLists.txt
    branches/soc-2011-cucumber/GNUmakefile
    branches/soc-2011-cucumber/SConstruct
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-i686.py
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2011-cucumber/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py
    branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py
    branches/soc-2011-cucumber/build_files/cmake/buildinfo.cmake
    branches/soc-2011-cucumber/build_files/cmake/macros.cmake
    branches/soc-2011-cucumber/build_files/cmake/packaging.cmake
    branches/soc-2011-cucumber/build_files/package_spec/rpm/blender.spec.in
    branches/soc-2011-cucumber/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
    branches/soc-2011-cucumber/build_files/scons/tools/btools.py
    branches/soc-2011-cucumber/doc/build_systems/scons-dev.txt
    branches/soc-2011-cucumber/doc/build_systems/scons.txt
    branches/soc-2011-cucumber/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-cucumber/extern/bullet2/src/SConscript
    branches/soc-2011-cucumber/extern/eltopo/SConscript
    branches/soc-2011-cucumber/intern/ghost/SConscript
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/mesh.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/nla.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_align.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/sequencer.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_logic.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_outliner.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-cucumber/release/scripts/templates/addon_add_object.py
    branches/soc-2011-cucumber/release/scripts/templates/operator_export.py
    branches/soc-2011-cucumber/release/scripts/templates/operator_mesh_add.py
    branches/soc-2011-cucumber/release/scripts/templates/operator_modal_view3d.py
    branches/soc-2011-cucumber/release/scripts/templates/operator_simple.py
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/cloth.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/nla.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/node.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_string.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/jitter.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_geom.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/rct.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/scanfill.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/string.c
    branches/soc-2011-cucumber/source/blender/blenloader/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-cucumber/source/blender/blenpluginapi/SConscript
    branches/soc-2011-cucumber/source/blender/collada/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/collada/DocumentExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/SConscript
    branches/soc-2011-cucumber/source/blender/editors/armature/SConscript
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poseSlide.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/SConscript
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-cucumber/source/blender/editors/object/SConscript
    branches/soc-2011-cucumber/source/blender/editors/object/object_add.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_bake.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
    branches/soc-2011-cucumber/source/blender/editors/physics/SConscript
    branches/soc-2011-cucumber/source/blender/editors/render/SConscript
    branches/soc-2011-cucumber/source/blender/editors/render/render_shading.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_update.c
    branches/soc-2011-cucumber/source/blender/editors/screen/SConscript
    branches/soc-2011-cucumber/source/blender/editors/screen/area.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2011-cucumber/source/blender/editors/space_console/console_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_console/space_console.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/SConscript
    branches/soc-2011-cucumber/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/filelist.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/SConscript
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_text/text_python.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/filter.c
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_sdna_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/makesdna/intern/SConscript
    branches/soc-2011-cucumber/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_access.h
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/SConscript
    branches/soc-2011-cucumber/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/makesrna/intern/SConscript
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-cucumber/source/blender/nodes/SConscript
    branches/soc-2011-cucumber/source/blender/python/generic/noise_py_api.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_util.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-cucumber/source/blender/render/SConscript
    branches/soc-2011-cucumber/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/envmap.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/gammaCorrectionTables.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/initrender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/occlusion.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pixelblending.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/shadbuf.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/sss.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/strand.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/sunsky.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/volume_precache.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/voxeldata.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-cucumber/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/windowmanager/SConscript
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2011-cucumber/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/soc-2011-cucumber/source/creator/CMakeLists.txt
    branches/soc-2011-cucumber/source/creator/buildinfo.c
    branches/soc-2011-cucumber/source/creator/creator.c
    branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp

Added Paths:
-----------
    branches/soc-2011-cucumber/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/soc-2011-cucumber/build_files/cmake/config/
    branches/soc-2011-cucumber/build_files/cmake/config/blender_headless.cmake
    branches/soc-2011-cucumber/build_files/cmake/config/blender_lite.cmake
    branches/soc-2011-cucumber/build_files/cmake/config/bpy_module.cmake
    branches/soc-2011-cucumber/build_files/scons/config/linux-config.py
    branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.ID.user_clear.1.py

Removed Paths:
-------------
    branches/soc-2011-cucumber/build_files/cmake/config/blender_headless.cmake
    branches/soc-2011-cucumber/build_files/cmake/config/blender_lite.cmake
    branches/soc-2011-cucumber/build_files/cmake/config/bpy_module.cmake
    branches/soc-2011-cucumber/build_files/scons/config/linux2-config.py

Property Changed:
----------------
    branches/soc-2011-cucumber/
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36829-39354
   + /trunk/blender:36829-39684

Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt	2011-08-24 20:48:37 UTC (rev 39684)
+++ branches/soc-2011-cucumber/CMakeLists.txt	2011-08-24 23:26:14 UTC (rev 39685)
@@ -63,6 +63,22 @@
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
 #-----------------------------------------------------------------------------
+# Set policy
+
+# see "cmake --help-policy CMP0003"
+# So library linking is more sane
+cmake_policy(SET CMP0003 NEW)
+
+# So BUILDINFO and BLENDERPATH strings are automatically quoted
+cmake_policy(SET CMP0005 NEW)
+
+# So syntax problems are errors
+cmake_policy(SET CMP0010 NEW)
+
+# Input directories must have CMakeLists.txt
+cmake_policy(SET CMP0014 NEW)
+
+#-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
 
@@ -258,6 +274,11 @@
 
 TEST_SSE_SUPPORT()
 
+# don't store paths to libs for portable distrobution
+if(WITH_INSTALL_PORTABLE)
+	set(CMAKE_SKIP_BUILD_RPATH TRUE)
+endif()
+
 #-----------------------------------------------------------------------------
 # Initialize un-cached vars, avoid unused warning
 
@@ -429,21 +450,20 @@
 	endif()
 
 	if(WITH_OPENCOLLADA)
-		set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
-		mark_as_advanced(OPENCOLLADA)
-		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-		set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
-		set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
+		find_package(OpenCOLLADA)
+		if(OPENCOLLADA_FOUND)
+			set(PCRE /usr CACHE PATH "PCRE Directory")
+			mark_as_advanced(PCRE)
+			set(PCRE_LIBPATH ${PCRE}/lib)
+			set(PCRE_LIB pcre)
 
-		set(PCRE /usr CACHE PATH "PCRE Directory")
-		mark_as_advanced(PCRE)
-		set(PCRE_LIBPATH ${PCRE}/lib)
-		set(PCRE_LIB pcre)
-
-		set(EXPAT /usr CACHE PATH "Expat Directory")
-		mark_as_advanced(EXPAT)
-		set(EXPAT_LIBPATH ${EXPAT}/lib)
-		set(EXPAT_LIB expat)
+			set(EXPAT /usr CACHE PATH "Expat Directory")
+			mark_as_advanced(EXPAT)
+			set(EXPAT_LIBPATH ${EXPAT}/lib)
+			set(EXPAT_LIB expat)
+		else()
+			set(WITH_OPENCOLLADA OFF)
+		endif()
 	endif()
 
 	if(WITH_MEM_JEMALLOC)
@@ -499,6 +519,9 @@
 	# GNU Compiler
 	if(CMAKE_COMPILER_IS_GNUCC)
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+	# CLang is the same as GCC for now.
+	elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken
@@ -665,9 +688,15 @@
 		endif()
 
 		if(WITH_OPENCOLLADA)
-			set(OPENCOLLADA_INCLUDE_DIR
-				${LIBDIR}/opencollada/include
+
+			set(OPENCOLLADA_INCLUDE_DIRS
+				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
+				${LIBDIR}/opencollada/include/COLLADABaseUtils/include
+				${LIBDIR}/opencollada/include/COLLADAFramework/include
+				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
+				${LIBDIR}/opencollada/include/GeneratedSaxParser/include			
 			)
+
 			set(OPENCOLLADA_LIBRARIES
 				${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
 				${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
@@ -691,11 +720,11 @@
 				${LIBDIR}/ffmpeg/include/msvc
 			)
 			set(FFMPEG_LIBRARIES
-				${LIBDIR}/ffmpeg/lib/avcodec-52.lib
-				${LIBDIR}/ffmpeg/lib/avformat-52.lib
-				${LIBDIR}/ffmpeg/lib/avdevice-52.lib
-				${LIBDIR}/ffmpeg/lib/avutil-50.lib
-				${LIBDIR}/ffmpeg/lib/swscale-0.lib
+				${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+				${LIBDIR}/ffmpeg/lib/avformat-53.lib
+				${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+				${LIBDIR}/ffmpeg/lib/avutil-51.lib
+				${LIBDIR}/ffmpeg/lib/swscale-2.lib
 			)
 		endif()
 
@@ -813,7 +842,13 @@
 
 		if(WITH_OPENCOLLADA)
 			set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
-			set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+			set(OPENCOLLADA_INCLUDE_DIRS
+				${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
+				${LIBDIR}/opencollada/include/COLLADABaseUtils/include
+				${LIBDIR}/opencollada/include/COLLADAFramework/include
+				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
+				${LIBDIR}/opencollada/include/GeneratedSaxParser/include			
+			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
 			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
 			set(PCRE_LIB pcre)
@@ -822,7 +857,7 @@
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
-			set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
+			set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2)
 			set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		endif()
 
@@ -1024,7 +1059,15 @@
 
 	if(WITH_OPENCOLLADA)
 		set(OPENCOLLADA ${LIBDIR}/opencollada)
-		set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+
+		set(OPENCOLLADA_INCLUDE_DIRS
+			${LIBDIR}/opencollada/include/COLLADAStreamWriter
+			${LIBDIR}/opencollada/include/COLLADABaseUtils
+			${LIBDIR}/opencollada/include/COLLADAFramework
+			${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
+			${LIBDIR}/opencollada/include/GeneratedSaxParser
+		)
+
 		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
 		set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
 		#pcre is bundled with openCollada

Modified: branches/soc-2011-cucumber/GNUmakefile
===================================================================
--- branches/soc-2011-cucumber/GNUmakefile	2011-08-24 20:48:37 UTC (rev 39684)
+++ branches/soc-2011-cucumber/GNUmakefile	2011-08-24 23:26:14 UTC (rev 39685)
@@ -35,17 +35,33 @@
 # Source and Build DIR's
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+BUILD_TYPE:=Release
+BUILD_CMAKE_ARGS:=""
 
 
+# -----------------------------------------------------------------------------
+# additional targets for the build configuration
+
 # support 'make debug'
 ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_debug
 	BUILD_TYPE:=Debug
-else
-	BUILD_TYPE:=Release
 endif
+ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
+	BUILD_DIR:=$(BUILD_DIR)_lite
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake
+endif
+ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
+	BUILD_DIR:=$(BUILD_DIR)_bpy
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
+endif
+ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
+	BUILD_DIR:=$(BUILD_DIR)_bpy
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake
+endif
 
 
+# -----------------------------------------------------------------------------
 # Get the number of cores for threaded build
 NPROCS:=1
 ifeq ($(OS), Linux)
@@ -61,14 +77,14 @@
 	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
 endif
 
-
+# -----------------------------------------------------------------------------
 # Build Blender
 all:
 	@echo
 	@echo Configuring Blender ...
 
 	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+		cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
 	fi
 
 	@echo
@@ -80,9 +96,40 @@
 	@echo
 
 debug: all
-	# pass
+lite: all
+headless: all
+bpy: all
 
-# package types
+# -----------------------------------------------------------------------------
+# Helo for build targets
+help:
+	@echo ""
+	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
+	@echo "  * debug     - build a debug binary"
+	@echo "  * lite      - disable non essential features for a smaller binary and faster build"
+	@echo "  * headless  - build without an interface (renderfarm or server automation)"
+	@echo "  * bpy       - build as a python module which can be loaded from python directly"
+	@echo ""
+	@echo "Project Files for IDE's"
+	@echo "  * project_qtcreator - QtCreator Project Files"
+	@echo "  * project_netbeans  - NetBeans Project Files"
+	@echo "  * project_eclipse   - Eclipse CDT4 Project Files"
+	@echo ""
+	@echo "Package Targets"
+	@echo "  * package_debian  - build a debian package"
+	@echo "  * package_pacman  - build an arch linux pacmanpackage"
+	@echo "  * package_archive - build an archive package"
+	@echo ""
+	@echo "Testing Targets (not assosiated with building blender)"
+	@echo "  * test            - run ctest, currently tests import/export, operator execution and that python modules load"
+	@echo "  * test_cmake      - runs our own cmake file checker which detects errors in the cmake file list definitions"
+	@echo "  * test_pep8       - checks all python script are pep8 which are tagged to use the stricter formatting"
+	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
+	@echo ""
+
+# -----------------------------------------------------------------------------
+# Packages
+#
 package_debian:
 	cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
 
@@ -93,7 +140,10 @@
 	make -C $(BUILD_DIR) -s package_archive
 	@echo archive in "$(BUILD_DIR)/release"
 
-# forward build targets
+
+# -----------------------------------------------------------------------------
+# Tests
+#
 test:
 	cd $(BUILD_DIR) ; ctest . --output-on-failure
 
@@ -111,6 +161,21 @@
 test_deprecated:
 	python3 source/tests/check_deprecated.py
 
+
+# -----------------------------------------------------------------------------
+# Project Files
+#
+
+project_qtcreator:
+	python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+
+project_netbeans:
+	python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+
+project_eclipse:

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list