[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36988] branches/soc-2011-pepper: Merge with trunk r36987.

Joerg Mueller nexyon at gmail.com
Sun May 29 02:48:04 CEST 2011


Revision: 36988
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36988
Author:   nexyon
Date:     2011-05-29 00:48:03 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Merge with trunk r36987.

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

Modified Paths:
--------------
    branches/soc-2011-pepper/CMakeLists.txt
    branches/soc-2011-pepper/build_files/cmake/cmake_netbeans_project.py
    branches/soc-2011-pepper/build_files/cmake/cmake_qtcreator_project.py
    branches/soc-2011-pepper/build_files/cmake/macros.cmake
    branches/soc-2011-pepper/build_files/cmake/project_info.py
    branches/soc-2011-pepper/build_files/scons/tools/Blender.py
    branches/soc-2011-pepper/build_files/scons/tools/btools.py
    branches/soc-2011-pepper/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
    branches/soc-2011-pepper/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-pepper/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
    branches/soc-2011-pepper/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
    branches/soc-2011-pepper/intern/audaspace/CMakeLists.txt
    branches/soc-2011-pepper/intern/audaspace/SConscript
    branches/soc-2011-pepper/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/soc-2011-pepper/intern/bsp/CMakeLists.txt
    branches/soc-2011-pepper/intern/bsp/SConscript
    branches/soc-2011-pepper/intern/container/CTR_TaggedIndex.h
    branches/soc-2011-pepper/intern/decimation/CMakeLists.txt
    branches/soc-2011-pepper/intern/decimation/SConscript
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-pepper/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2011-pepper/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2011-pepper/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-pepper/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/soc-2011-pepper/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2011-pepper/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/soc-2011-pepper/release/scripts/modules/bpy_types.py
    branches/soc-2011-pepper/release/scripts/startup/bl_operators/mesh.py
    branches/soc-2011-pepper/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2011-pepper/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-pepper/release/windows/installer/00.sconsblender.nsi
    branches/soc-2011-pepper/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-pepper/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-pepper/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-pepper/source/blender/blenkernel/SConscript
    branches/soc-2011-pepper/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/image.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/object.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/text.c
    branches/soc-2011-pepper/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-pepper/source/blender/blenlib/BLI_path_util.h
    branches/soc-2011-pepper/source/blender/blenlib/BLI_string.h
    branches/soc-2011-pepper/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2011-pepper/source/blender/blenlib/intern/math_color.c
    branches/soc-2011-pepper/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-pepper/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-pepper/source/blender/blenlib/intern/rct.c
    branches/soc-2011-pepper/source/blender/blenlib/intern/string.c
    branches/soc-2011-pepper/source/blender/blenloader/BLO_readfile.h
    branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-pepper/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2011-pepper/source/blender/editors/animation/keyingsets.c
    branches/soc-2011-pepper/source/blender/editors/armature/editarmature.c
    branches/soc-2011-pepper/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2011-pepper/source/blender/editors/armature/poselib.c
    branches/soc-2011-pepper/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-pepper/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-pepper/source/blender/editors/include/ED_keyframing.h
    branches/soc-2011-pepper/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-pepper/source/blender/editors/interface/interface.c
    branches/soc-2011-pepper/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-pepper/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-pepper/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-pepper/source/blender/editors/object/object_edit.c
    branches/soc-2011-pepper/source/blender/editors/object/object_hook.c
    branches/soc-2011-pepper/source/blender/editors/object/object_modifier.c
    branches/soc-2011-pepper/source/blender/editors/object/object_relations.c
    branches/soc-2011-pepper/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-pepper/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-pepper/source/blender/editors/screen/screen_edit.c
    branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-pepper/source/blender/editors/space_file/space_file.c
    branches/soc-2011-pepper/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-pepper/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-pepper/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-pepper/source/blender/editors/util/undo.c
    branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-pepper/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-pepper/source/blender/imbuf/CMakeLists.txt
    branches/soc-2011-pepper/source/blender/imbuf/SConscript
    branches/soc-2011-pepper/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-pepper/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2011-pepper/source/blender/imbuf/intern/scaling.c
    branches/soc-2011-pepper/source/blender/imbuf/intern/targa.c
    branches/soc-2011-pepper/source/blender/imbuf/intern/util.c
    branches/soc-2011-pepper/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-pepper/source/blender/makesrna/RNA_access.h
    branches/soc-2011-pepper/source/blender/makesrna/RNA_define.h
    branches/soc-2011-pepper/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-pepper/source/blender/makesrna/RNA_types.h
    branches/soc-2011-pepper/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_image.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_armature.c
    branches/soc-2011-pepper/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2011-pepper/source/blender/python/generic/IDProp.c
    branches/soc-2011-pepper/source/blender/python/generic/bgl.c
    branches/soc-2011-pepper/source/blender/python/generic/blf_py_api.c
    branches/soc-2011-pepper/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2011-pepper/source/blender/python/generic/mathutils.c
    branches/soc-2011-pepper/source/blender/python/generic/mathutils_Color.c
    branches/soc-2011-pepper/source/blender/python/generic/mathutils_Euler.c
    branches/soc-2011-pepper/source/blender/python/generic/mathutils_Matrix.c
    branches/soc-2011-pepper/source/blender/python/generic/mathutils_Quaternion.c
    branches/soc-2011-pepper/source/blender/python/generic/mathutils_Vector.c
    branches/soc-2011-pepper/source/blender/python/generic/mathutils_geometry.c
    branches/soc-2011-pepper/source/blender/python/generic/noise_py_api.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_library.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_props.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-pepper/source/blender/python/intern/bpy_rna.h
    branches/soc-2011-pepper/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-pepper/source/creator/CMakeLists.txt
    branches/soc-2011-pepper/source/creator/creator.c
    branches/soc-2011-pepper/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-pepper/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-pepper/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2011-pepper/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2011-pepper/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-pepper/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2011-pepper/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2011-pepper/source/gameengine/VideoTexture/SConscript
    branches/soc-2011-pepper/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2011-pepper/source/gameengine/VideoTexture/VideoFFmpeg.h

Added Paths:
-----------
    branches/soc-2011-pepper/intern/ffmpeg/
    branches/soc-2011-pepper/intern/ffmpeg/ffmpeg_compat.h

Removed Paths:
-------------
    branches/soc-2011-pepper/intern/ffmpeg/ffmpeg_compat.h

Property Changed:
----------------
    branches/soc-2011-pepper/
    branches/soc-2011-pepper/release/scripts/modules/bpy/ops.py
    branches/soc-2011-pepper/release/scripts/modules/bpy/utils.py
    branches/soc-2011-pepper/release/scripts/presets/sss/chicken.py
    branches/soc-2011-pepper/release/scripts/presets/sss/cream.py
    branches/soc-2011-pepper/release/scripts/presets/sss/ketchup.py
    branches/soc-2011-pepper/release/scripts/presets/sss/marble.py
    branches/soc-2011-pepper/release/scripts/presets/sss/potato.py
    branches/soc-2011-pepper/release/scripts/presets/sss/skim_milk.py
    branches/soc-2011-pepper/release/scripts/presets/sss/skin1.py
    branches/soc-2011-pepper/release/scripts/presets/sss/skin2.py
    branches/soc-2011-pepper/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2011-pepper/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-pepper/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-pepper/source/blender/blenkernel/BKE_customdata_file.h
    branches/soc-2011-pepper/source/blender/blenkernel/intern/customdata_file.c
    branches/soc-2011-pepper/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2011-pepper/source/blender/editors/include/ED_particle.h
    branches/soc-2011-pepper/source/blender/editors/include/ED_physics.h
    branches/soc-2011-pepper/source/blender/editors/include/ED_render.h
    branches/soc-2011-pepper/source/blender/editors/include/ED_transform.h
    branches/soc-2011-pepper/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-pepper/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-pepper/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-pepper/source/blender/editors/object/object_add.c
    branches/soc-2011-pepper/source/blender/editors/object/object_constraint.c
    branches/soc-2011-pepper/source/blender/editors/object/object_group.c
    branches/soc-2011-pepper/source/blender/editors/object/object_hook.c
    branches/soc-2011-pepper/source/blender/editors/object/object_lattice.c
    branches/soc-2011-pepper/source/blender/editors/object/object_relations.c
    branches/soc-2011-pepper/source/blender/editors/object/object_select.c
    branches/soc-2011-pepper/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-pepper/source/blender/editors/object/object_transform.c
    branches/soc-2011-pepper/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-pepper/source/blender/editors/physics/particle_boids.c
    branches/soc-2011-pepper/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-pepper/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-pepper/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2011-pepper/source/blender/editors/render/
    branches/soc-2011-pepper/source/blender/editors/render/render_intern.h
    branches/soc-2011-pepper/source/blender/editors/render/render_preview.c
    branches/soc-2011-pepper/source/blender/editors/render/render_shading.c
    branches/soc-2011-pepper/source/blender/editors/render/render_update.c
    branches/soc-2011-pepper/source/blender/editors/sculpt_paint/
    branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-pepper/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-pepper/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-pepper/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-pepper/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-pepper/source/blender/editors/space_node/node_state.c
    branches/soc-2011-pepper/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-pepper/source/blender/editors/space_userpref/
    branches/soc-2011-pepper/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2011-pepper/source/blender/editors/space_userpref/userpref_intern.h
    branches/soc-2011-pepper/source/blender/editors/space_userpref/userpref_ops.c
    branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_buttons.c
    branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-pepper/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-pepper/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2011-pepper/source/blender/makesrna/intern/rna_sculpt_paint.c


Property changes on: branches/soc-2011-pepper
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/blender:36830-36987

Modified: branches/soc-2011-pepper/CMakeLists.txt
===================================================================
--- branches/soc-2011-pepper/CMakeLists.txt	2011-05-28 21:53:07 UTC (rev 36987)
+++ branches/soc-2011-pepper/CMakeLists.txt	2011-05-29 00:48:03 UTC (rev 36988)
@@ -55,33 +55,19 @@
 # quiet output for Makefiles, 'make -s' helps too
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
-# ignore system set flag, use our own
-# must be before project(...)
-# if the user wants to add their own its ok after first run.
-if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
-	set(_reset_standard_libraries OFF)
-else()
-	set(_reset_standard_libraries ON)
-endif()
+#-----------------------------------------------------------------------------
+# Load some macros.
+include(build_files/cmake/macros.cmake)
 
 
-project(Blender)
+#-----------------------------------------------------------------------------
+# Initialize project.
 
+blender_project_hack_pre()
 
-if (_reset_standard_libraries)
-	# Must come after project(...)
-	#
-	# MINGW workaround for -ladvapi32 being included which surprisingly causes
-	# string formatting of floats, eg: printf("%.*f", 3, value). to crash blender
-	# with a meaningless stack trace. by overriding this flag we ensure we only
-	# have libs we define and that cmake & scons builds match.
-	set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
-	set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
-	mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
-	mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
-endif()
-unset(_reset_standard_libraries)
+project(Blender)
 
+blender_project_hack_post()
 
 enable_testing()
 
@@ -92,10 +78,6 @@
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
 
 #-----------------------------------------------------------------------------
-# Load some macros.
-include(build_files/cmake/macros.cmake)
-
-#-----------------------------------------------------------------------------
 # Set default config options
 
 get_blender_version()
@@ -106,7 +88,7 @@
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
 option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
 mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
-mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather then have them patch it, make a build option.
+mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
@@ -984,6 +966,12 @@
 #-----------------------------------------------------------------------------
 # Common.
 
+if(APPLE OR WIN32)
+	if(NOT IS_DIRECTORY "${LIBDIR}")
+		message(FATAL_ERROR "Apple and Windows require pre-compiled libs at: '${LIBDIR}'")
+	endif()
+endif()
+
 if(WITH_RAYOPTIMIZATION)
 	if(CMAKE_COMPILER_IS_GNUCC)
 		if(SUPPORT_SSE_BUILD)
@@ -1144,9 +1132,9 @@
 #-------------------------------------------------------------------------------
 # Global Defines
 
-# better not define flags here but this is a debugging option thats off by default.
+# better not set includes here but this debugging option is off by default.
 if(WITH_CXX_GUARDEDALLOC)
-	set(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC -I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+	include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
 endif()
 
 if(WITH_ASSERT_ABORT)

Modified: branches/soc-2011-pepper/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/cmake_netbeans_project.py	2011-05-28 21:53:07 UTC (rev 36987)
+++ branches/soc-2011-pepper/build_files/cmake/cmake_netbeans_project.py	2011-05-29 00:48:03 UTC (rev 36988)
@@ -33,7 +33,7 @@
 from project_info import *
 
 import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, relpath, exists
 
 
 def create_nb_project_main():
@@ -50,7 +50,6 @@
         includes.sort()
 
         PROJECT_NAME = "Blender"
-        FILE_NAME = PROJECT_NAME.lower()
 
         # --------------- NB spesific
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
@@ -76,7 +75,7 @@
         if not exists(PROJECT_DIR_NB):
             os.mkdir(PROJECT_DIR_NB)
 
-        SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
+        # SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
 
         f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
 

Modified: branches/soc-2011-pepper/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/cmake_qtcreator_project.py	2011-05-28 21:53:07 UTC (rev 36987)
+++ branches/soc-2011-pepper/build_files/cmake/cmake_qtcreator_project.py	2011-05-29 00:48:03 UTC (rev 36988)
@@ -34,54 +34,52 @@
 from project_info import *
 
 import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
-
 import sys
 
 
 def create_qtc_project_main():
     files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
-    files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+    files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
     files_rel.sort()
 
     # --- qtcreator specific, simple format
     if SIMPLE_PROJECTFILE:
         # --- qtcreator specific, simple format
         PROJECT_NAME = "Blender"
-        f = open(join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
+        f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
         f.write("\n".join(files_rel))
 
-        f = open(join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
-        f.write("\n".join(sorted(list(set(dirname(f) for f in files_rel if is_c_header(f))))))
+        f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
+        f.write("\n".join(sorted(list(set(os.path.dirname(f) for f in files_rel if is_c_header(f))))))
 
-        qtc_prj = join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
+        qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
         f = open(qtc_prj, 'w')
         f.write("[General]\n")
 
-        qtc_cfg = join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
-        if not exists(qtc_cfg):
+        qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
+        if not os.path.exists(qtc_cfg):
             f = open(qtc_cfg, 'w')
             f.write("// ADD PREDEFINED MACROS HERE!\n")
     else:
         includes, defines = cmake_advanced_info()
 
         # for some reason it doesnt give all internal includes
-        includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
+        includes = list(set(includes) | set(os.path.dirname(f) for f in files_rel if is_c_header(f)))
         includes.sort()
 
         PROJECT_NAME = "Blender"
         FILE_NAME = PROJECT_NAME.lower()
-        f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+        f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
         f.write("\n".join(files_rel))
 
-        f = open(join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
+        f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
         f.write("\n".join(sorted(includes)))
 
-        qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+        qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
         f = open(qtc_prj, 'w')
         f.write("[General]\n")
 
-        qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
+        qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
         f = open(qtc_cfg, 'w')
         f.write("// ADD PREDEFINED MACROS HERE!\n")
         defines_final = [("#define %s %s" % item) for item in defines]
@@ -95,21 +93,21 @@
 
 def create_qtc_project_python():
     files = list(source_list(SOURCE_DIR, filename_check=is_py))
-    files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+    files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
     files_rel.sort()
 
     # --- qtcreator specific, simple format
     PROJECT_NAME = "Blender_Python"
     FILE_NAME = PROJECT_NAME.lower()
-    f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+    f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
     f.write("\n".join(files_rel))
 
-    qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+    qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
     f = open(qtc_prj, 'w')
     f.write("[General]\n")
 
-    qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
-    if not exists(qtc_cfg):
+    qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
+    if not os.path.exists(qtc_cfg):
         f = open(qtc_cfg, 'w')
         f.write("// ADD PREDEFINED MACROS HERE!\n")
 

Modified: branches/soc-2011-pepper/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/macros.cmake	2011-05-28 21:53:07 UTC (rev 36987)
+++ branches/soc-2011-pepper/build_files/cmake/macros.cmake	2011-05-29 00:48:03 UTC (rev 36988)
@@ -13,19 +13,13 @@
 	include_directories(${all_incs})
 endmacro()
 
-# only MSVC uses SOURCE_GROUP
-macro(blender_add_lib_nolist
-	name
-	sources
-	includes)
 
-	# message(STATUS "Configuring library ${name}")
+macro(blender_source_group
+	sources)
 
-	blender_include_dirs("${includes}")
-	add_library(${name} ${sources})
-
 	# Group by location on disk
 	source_group("Source Files" FILES CMakeLists.txt)
+
 	foreach(SRC ${sources})
 		get_filename_component(SRC_EXT ${SRC} EXT)
 		if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
@@ -36,17 +30,27 @@
 	endforeach()
 endmacro()
 
-#	# works fine but having the includes listed is helpful for IDE's (QtCreator/MSVC)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list