[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40306] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 40299.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sat Sep 17 20:54:17 CEST 2011
Revision: 40306
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40306
Author: kjym3
Date: 2011-09-17 18:54:16 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 40299.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40299
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/GNUmakefile
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPCRE.cmake
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindXML2.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.ID.user_clear.1.py
branches/soc-2008-mxcurioni/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.sh
branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/navmesh_conversion.cpp
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_voxel.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/voxel.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/CameraExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseSlide.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sculpt.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_navmesh.cpp
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/iris.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_property.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/gpu.c
branches/soc-2008-mxcurioni/source/blender/render/intern/include/voxeldata.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_sparse.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_static_check_splint.py
branches/soc-2008-mxcurioni/build_files/cmake/project_source_info.py
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-39896,39898-40096,40098-40189
+ /trunk/blender:34011-39896,39898-40096,40098-40299
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-09-17 17:18:55 UTC (rev 40305)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-09-17 18:54:16 UTC (rev 40306)
@@ -642,11 +642,7 @@
set(GETTEXT ${LIBDIR}/gettext)
set(GETTEXT_INC ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- if(CMAKE_CL_64)
- set(GETTEXT_LIB gettext)
- else()
- set(GETTEXT_LIB gnu_gettext)
- endif()
+ set(GETTEXT_LIB gnu_gettext)
endif()
if(CMAKE_CL_64)
Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile 2011-09-17 17:18:55 UTC (rev 40305)
+++ branches/soc-2008-mxcurioni/GNUmakefile 2011-09-17 18:54:16 UTC (rev 40306)
@@ -126,6 +126,11 @@
@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 ""
+ @echo "Static Source Code Checking (not assosiated with building blender)"
+ @echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
+ @echo " * check_splint - run blenders source through splint (C only)"
+ @echo " * check_sparse - run blenders source through sparse (C only)"
+ @echo ""
# -----------------------------------------------------------------------------
# Packages
@@ -176,6 +181,20 @@
cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
+# -----------------------------------------------------------------------------
+# Static Checking
+#
+
+check_cppcheck:
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+
+check_splint:
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+
+check_sparse:
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-09-17 17:18:55 UTC (rev 40305)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-09-17 18:54:16 UTC (rev 40306)
@@ -645,7 +645,7 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
- if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+ if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
# For MinGW and linuxcross static linking will be used
dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
Modified: branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-09-17 17:18:55 UTC (rev 40305)
+++ branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-09-17 18:54:16 UTC (rev 40306)
@@ -119,8 +119,8 @@
# Ubuntu ppa needs this.
lib64/opencollada lib/opencollada
)
+ MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
- MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
ENDIF()
ENDFOREACH()
Modified: branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPCRE.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPCRE.cmake 2011-09-17 17:18:55 UTC (rev 40305)
+++ branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindPCRE.cmake 2011-09-17 18:54:16 UTC (rev 40306)
@@ -1,43 +1,69 @@
-# - Try to find the PCRE regular expression library
-# Once done this will define
+# - Find PCRE library
+# Find the native PCRE includes and library
+# This module defines
+# PCRE_INCLUDE_DIRS, where to find pcre.h, Set when
+# PCRE_INCLUDE_DIR is found.
+# PCRE_LIBRARIES, libraries to link against to use PCRE.
+# PCRE_ROOT_DIR, The base directory to search for PCRE.
+# This can also be an environment variable.
+# PCRE_FOUND, If false, do not try to use PCRE.
#
-# PCRE_FOUND - system has the PCRE library
-# PCRE_INCLUDE_DIR - the PCRE include directory
-# PCRE_LIBRARIES - The libraries needed to use PCRE
+# also defined, but not for general use are
+# PCRE_LIBRARY, where to find the PCRE library.
-# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+#=============================================================================
+# Copyright 2011 Blender Foundation.
#
-# Redistribution and use is allowed according to the terms of the BSD license.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
-if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
- # Already in cache, be silent
- set(PCRE_FIND_QUIETLY TRUE)
-endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
-
-if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_PCRE QUIET libpcre)
- set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
-endif (NOT WIN32)
+# If PCRE_ROOT_DIR was defined in the environment, use it.
+IF(NOT PCRE_ROOT_DIR AND NOT $ENV{PCRE_ROOT_DIR} STREQUAL "")
+ SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR})
+ENDIF()
-find_path(PCRE_INCLUDE_DIR pcre.h
- HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS}
- PATH_SUFFIXES pcre)
+SET(_pcre_SEARCH_DIRS
+ ${PCRE_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
-find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+FIND_PATH(PCRE_INCLUDE_DIR pcre.h
+ HINTS
+ ${_pcre_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include
+ include
+)
-find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+FIND_LIBRARY(PCRE_LIBRARY
+ NAMES
+ pcre
+ HINTS
+ ${_pcre_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
-include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG
+ PCRE_LIBRARY PCRE_INCLUDE_DIR)
-IF(NOT WIN32)
- find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
- mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
- set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
-ELSE()
- find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY )
- set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} )
- mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCRE_LIBRARY)
-ENDIF()
+IF(PCRE_FOUND)
+ SET(PCRE_LIBRARIES ${PCRE_LIBRARY})
+ SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR})
+ENDIF(PCRE_FOUND)
+
+MARK_AS_ADVANCED(
+ PCRE_INCLUDE_DIR
+ PCRE_LIBRARY
+)
Modified: branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindXML2.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindXML2.cmake 2011-09-17 17:18:55 UTC (rev 40305)
+++ branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindXML2.cmake 2011-09-17 18:54:16 UTC (rev 40306)
@@ -1,88 +1,68 @@
-# - Try to find XML2
-# Once done this will define
+# - Find XML2 library
+# Find the native XML2 includes and library
+# This module defines
+# XML2_INCLUDE_DIRS, where to find xml2.h, Set when
+# XML2_INCLUDE_DIR is found.
+# XML2_LIBRARIES, libraries to link against to use XML2.
+# XML2_ROOT_DIR, The base directory to search for XML2.
+# This can also be an environment variable.
+# XML2_FOUND, If false, do not try to use XML2.
#
-# XML2_FOUND - system has XML2
-# XML2_INCLUDE_DIRS - the XML2 include directory
-# XML2_LIBRARIES - Link these to use XML2
-# XML2_DEFINITIONS - Compiler switches required for using XML2
+# also defined, but not for general use are
+# XML2_LIBRARY, where to find the XML2 library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
#
-# Copyright (c) 2008 Andreas Schneider <mail at cynapses.org>
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# If XML2_ROOT_DIR was defined in the environment, use it.
+IF(NOT XML2_ROOT_DIR AND NOT $ENV{XML2_ROOT_DIR} STREQUAL "")
+ SET(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR})
+ENDIF()
-if (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
- # in cache already
- set(XML2_FOUND TRUE)
-else (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
- include(UsePkgConfig)
- pkgconfig(libxml-2.0 _XML2_INCLUDEDIR _XML2_LIBDIR _XML2_LDFLAGS _XML2_CFLAGS)
- else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
- find_package(PkgConfig)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list