[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40309] branches/soc-2011-onion-uv-tools: merge with trunk 40308

Antony Riakiotakis kalast at gmail.com
Sun Sep 18 01:45:07 CEST 2011


Revision: 40309
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40309
Author:   psy-fi
Date:     2011-09-17 23:45:06 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
merge with trunk 40308

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/GNUmakefile
    branches/soc-2011-onion-uv-tools/SConstruct
    branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindOpenCOLLADA.cmake
    branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindPCRE.cmake
    branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindXML2.cmake
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.ID.user_clear.1.py
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2011-onion-uv-tools/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_info.py
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_curve.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/SConscript
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/action.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/collision.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/navmesh_conversion.cpp
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/node.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/screen.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_string.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_voxel.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/string.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/voxel.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/TransformReader.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/TransformWriter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_filter.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseSlide.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poselib.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editcurve.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_armature.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_curve.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_sculpt.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_hook.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_navmesh.cpp
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_relations.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_shading.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_context.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sound/sound_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_action/action_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_action/action_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_console/console_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/filter.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/iris.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/jp2.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_key.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_property.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_text.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_texture_api.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/py_capi_utils.h
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/gpu.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/voxeldata.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/envmap.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeinput.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/voxeldata.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/creator/creator.c
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Scene.cpp

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_static_check_sparse.py
    branches/soc-2011-onion-uv-tools/build_files/cmake/cmake_static_check_splint.py
    branches/soc-2011-onion-uv-tools/build_files/cmake/project_source_info.py
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/string_utf8.c

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39665-40189
   + /trunk/blender:39665-40308

Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt	2011-09-17 20:50:22 UTC (rev 40308)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt	2011-09-17 23:45:06 UTC (rev 40309)
@@ -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-2011-onion-uv-tools/GNUmakefile
===================================================================
--- branches/soc-2011-onion-uv-tools/GNUmakefile	2011-09-17 20:50:22 UTC (rev 40308)
+++ branches/soc-2011-onion-uv-tools/GNUmakefile	2011-09-17 23:45:06 UTC (rev 40309)
@@ -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-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct	2011-09-17 20:50:22 UTC (rev 40308)
+++ branches/soc-2011-onion-uv-tools/SConstruct	2011-09-17 23:45:06 UTC (rev 40309)
@@ -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-2011-onion-uv-tools/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-17 20:50:22 UTC (rev 40308)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/Modules/FindOpenCOLLADA.cmake	2011-09-17 23:45:06 UTC (rev 40309)
@@ -1,118 +1,139 @@
-# - Find OpenCOLLADA library
-# Find the native OpenCOLLADA includes and library
-# This module defines
-#  OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and 
-#                 COLLADAFramework/, Set when OPENCOLLADA_INCLUDE_DIR is found.
-#  OPENCOLLADA_LIBRARIES, libraries to link against to use OpenCOLLADA.
-#  OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
-#                    This can also be an environment variable.
-#  OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA.
-#
-# also defined, but not for general use are
-#  OPENCOLLADA_LIBRARY, where to find the OpenCOLLADA library.
-
-#=============================================================================
-# Copyright 2011 Blender Foundation.
-#
-# 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.
-#=============================================================================
-
-# note about include paths, there are 2 ways includes are set
-#
-# Where '/usr/include/opencollada' is the root dir:
-#   /usr/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h
-#
-# Where '/opt/opencollada' is the base dir:
-# /opt/opencollada/COLLADABaseUtils/include/COLLADABUPlatform.h
-
-# If OPENCOLLADA_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENCOLLADA_ROOT_DIR AND NOT $ENV{OPENCOLLADA_ROOT_DIR} STREQUAL "")
-  SET(OPENCOLLADA_ROOT_DIR $ENV{OPENCOLLADA_ROOT_DIR})
-ENDIF()
-
-SET(_opencollada_FIND_INCLUDES
-  COLLADAStreamWriter
-  COLLADABaseUtils
-  COLLADAFramework
-  COLLADASaxFrameworkLoader
-  GeneratedSaxParser
-)
-
-SET(_opencollada_FIND_COMPONENTS
-  OpenCOLLADAStreamWriter
-  OpenCOLLADASaxFrameworkLoader
-  OpenCOLLADAFramework
-  OpenCOLLADABaseUtils
-  GeneratedSaxParser
-  UTF
-  MathMLSolver
-  pcre
-  ftoa
-  buffer
-  xml2
-)
-
-SET(_opencollada_SEARCH_DIRS
-  ${OPENCOLLADA_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-)
-
-SET(_opencollada_INCLUDES)
-FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  # need to use this even thouh we are looking for a dir
-  FIND_FILE(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR
-    NAMES
-      ${COMPONENT}/include
-      ${COMPONENT}
-      # Ubuntu ppa needs this.
-      # Alternative would be to suffix all members of search path
-      # but this is less trouble, just looks strange.
-      include/opencollada/${COMPONENT}
-    HINTS
-      ${_opencollada_SEARCH_DIRS}
-    )
-  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR)
-  LIST(APPEND _opencollada_INCLUDES "${OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR}")
-ENDFOREACH()
-
-
-SET(_opencollada_LIBRARIES)
-FOREACH(COMPONENT ${_opencollada_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_opencollada_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-      # Ubuntu ppa needs this.
-      lib64/opencollada lib/opencollada
-    )
-  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
-  LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-
-# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA  DEFAULT_MSG
-    _opencollada_LIBRARIES _opencollada_INCLUDES)
-
-
-IF(OPENCOLLADA_FOUND)
-  SET(OPENCOLLADA_LIBRARIES ${_opencollada_LIBRARIES})
-  SET(OPENCOLLADA_INCLUDE_DIRS ${_opencollada_INCLUDES})
-ENDIF(OPENCOLLADA_FOUND)
+# - Find OpenCOLLADA library
+# Find the native OpenCOLLADA includes and library
+# This module defines
+#  OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and 
+#                 COLLADAFramework/, Set when OPENCOLLADA_INCLUDE_DIR is found.
+#  OPENCOLLADA_LIBRARIES, libraries to link against to use OpenCOLLADA.
+#  OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
+#                    This can also be an environment variable.
+#  OPENCOLLADA_FOUND, If false, do not try to use OpenCOLLADA.
+#
+# also defined, but not for general use are
+#  OPENCOLLADA_LIBRARY, where to find the OpenCOLLADA library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# 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.
+#=============================================================================
+
+# note about include paths, there are 2 ways includes are set
+#
+# Where '/usr/include/opencollada' is the root dir:
+#   /usr/include/opencollada/COLLADABaseUtils/COLLADABUPlatform.h
+#
+# Where '/opt/opencollada' is the base dir:
+# /opt/opencollada/COLLADABaseUtils/include/COLLADABUPlatform.h
+
+# If OPENCOLLADA_ROOT_DIR was defined in the environment, use it.
+IF(NOT OPENCOLLADA_ROOT_DIR AND NOT $ENV{OPENCOLLADA_ROOT_DIR} STREQUAL "")
+  SET(OPENCOLLADA_ROOT_DIR $ENV{OPENCOLLADA_ROOT_DIR})
+ENDIF()
+
+SET(_opencollada_FIND_INCLUDES
+  COLLADAStreamWriter
+  COLLADABaseUtils
+  COLLADAFramework
+  COLLADASaxFrameworkLoader
+  GeneratedSaxParser
+)
+
+SET(_opencollada_FIND_COMPONENTS
+  OpenCOLLADAStreamWriter
+  OpenCOLLADASaxFrameworkLoader
+  OpenCOLLADAFramework
+  OpenCOLLADABaseUtils
+  GeneratedSaxParser
+  MathMLSolver
+)
+
+# Fedora openCOLLADA package links these statically
+SET(_opencollada_FIND_STATIC_COMPONENTS
+  UTF
+  ftoa
+  buffer
+)
+
+SET(_opencollada_SEARCH_DIRS
+  ${OPENCOLLADA_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+)
+
+SET(_opencollada_INCLUDES)
+FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
+  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+  # need to use this even thouh we are looking for a dir
+  FIND_FILE(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR
+    NAMES
+      ${COMPONENT}/include
+      ${COMPONENT}
+      # Ubuntu ppa needs this.
+      # Alternative would be to suffix all members of search path
+      # but this is less trouble, just looks strange.
+      include/opencollada/${COMPONENT}
+    HINTS
+      ${_opencollada_SEARCH_DIRS}
+    )
+  MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR)
+  LIST(APPEND _opencollada_INCLUDES "${OPENCOLLADA_${UPPERCOMPONENT}_INCLUDE_DIR}")
+ENDFOREACH()
+
+
+SET(_opencollada_LIBRARIES)
+FOREACH(COMPONENT ${_opencollada_FIND_COMPONENTS})
+  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+  FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY
+    NAMES
+      ${COMPONENT}
+    HINTS

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list