[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39791] branches/soc-2011-pepper: * Merge trunk up to r39790.
Joerg Mueller
nexyon at gmail.com
Tue Aug 30 10:22:04 CEST 2011
Revision: 39791
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39791
Author: nexyon
Date: 2011-08-30 08:22:03 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
* Merge trunk up to r39790.
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39790
Modified Paths:
--------------
branches/soc-2011-pepper/CMakeLists.txt
branches/soc-2011-pepper/SConstruct
branches/soc-2011-pepper/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-pepper/build_files/cmake/packaging.cmake
branches/soc-2011-pepper/build_files/package_spec/rpm/blender.spec.in
branches/soc-2011-pepper/build_files/scons/config/darwin-config.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/doc/python_api/sphinx_doc_gen.sh
branches/soc-2011-pepper/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-pepper/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-pepper/intern/itasc/kdl/frames_io.cpp
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/modules/console_python.py
branches/soc-2011-pepper/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-pepper/source/blender/avi/intern/avi.c
branches/soc-2011-pepper/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_image.h
branches/soc-2011-pepper/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-pepper/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/anim.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/image.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/library.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/material.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/multires.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/object.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/particle.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-pepper/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-pepper/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-pepper/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-pepper/source/blender/blenlib/BLI_string.h
branches/soc-2011-pepper/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-pepper/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-pepper/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-pepper/source/blender/blenlib/intern/fileops.c
branches/soc-2011-pepper/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-pepper/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-pepper/source/blender/blenlib/intern/noise.c
branches/soc-2011-pepper/source/blender/blenlib/intern/string.c
branches/soc-2011-pepper/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-pepper/source/blender/blenloader/intern/readfile.c
branches/soc-2011-pepper/source/blender/blenloader/intern/writefile.c
branches/soc-2011-pepper/source/blender/collada/CMakeLists.txt
branches/soc-2011-pepper/source/blender/collada/SConscript
branches/soc-2011-pepper/source/blender/editors/animation/anim_markers.c
branches/soc-2011-pepper/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-pepper/source/blender/editors/armature/editarmature.c
branches/soc-2011-pepper/source/blender/editors/include/ED_view3d.h
branches/soc-2011-pepper/source/blender/editors/interface/interface_draw.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_icons.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_layout.c
branches/soc-2011-pepper/source/blender/editors/interface/interface_templates.c
branches/soc-2011-pepper/source/blender/editors/interface/resources.c
branches/soc-2011-pepper/source/blender/editors/object/object_modifier.c
branches/soc-2011-pepper/source/blender/editors/physics/particle_edit.c
branches/soc-2011-pepper/source/blender/editors/physics/physics_pointcache.c
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/screen/screen_edit.c
branches/soc-2011-pepper/source/blender/editors/screen/screen_ops.c
branches/soc-2011-pepper/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-pepper/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-pepper/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2011-pepper/source/blender/editors/space_console/space_console.c
branches/soc-2011-pepper/source/blender/editors/space_file/file_ops.c
branches/soc-2011-pepper/source/blender/editors/space_file/fsmenu.c
branches/soc-2011-pepper/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-pepper/source/blender/editors/space_image/image_ops.c
branches/soc-2011-pepper/source/blender/editors/space_node/node_edit.c
branches/soc-2011-pepper/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-pepper/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/SConscript
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-pepper/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-pepper/source/blender/editors/space_text/space_text.c
branches/soc-2011-pepper/source/blender/editors/space_text/text_ops.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/drawmesh.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_ops.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-pepper/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-pepper/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-pepper/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-pepper/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-pepper/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-pepper/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-pepper/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2011-pepper/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2011-pepper/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-pepper/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-pepper/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-pepper/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-pepper/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-pepper/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2011-pepper/source/blender/imbuf/intern/filter.c
branches/soc-2011-pepper/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-pepper/source/blender/imbuf/intern/tiff.c
branches/soc-2011-pepper/source/blender/imbuf/intern/util.c
branches/soc-2011-pepper/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-pepper/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-pepper/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-pepper/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-pepper/source/blender/makesrna/intern/CMakeLists.txt
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_define.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_nodetree.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_scene.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_sequencer.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/python/intern/bpy_intern_string.c
branches/soc-2011-pepper/source/blender/python/intern/bpy_operator.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_traceback.c
branches/soc-2011-pepper/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-pepper/source/blender/render/intern/source/convertblender.c
branches/soc-2011-pepper/source/blender/render/intern/source/pipeline.c
branches/soc-2011-pepper/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-pepper/source/blender/render/intern/source/render_texture.c
branches/soc-2011-pepper/source/blender/windowmanager/SConscript
branches/soc-2011-pepper/source/blender/windowmanager/WM_api.h
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-pepper/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-pepper/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-pepper/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-pepper/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-pepper/source/gameengine/Converter/KX_ConvertControllers.cpp
branches/soc-2011-pepper/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Material.h
branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2011-pepper/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2011-pepper/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-pepper/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-pepper/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2011-pepper/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2011-pepper/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2011-pepper/source/gameengine/VideoTexture/Exception.cpp
Added Paths:
-----------
branches/soc-2011-pepper/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2011-pepper/doc/python_api/examples/bpy.types.ID.user_clear.1.py
branches/soc-2011-pepper/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-pepper/doc/python_api/rst/info_overview.rst
branches/soc-2011-pepper/doc/python_api/rst/info_quickstart.rst
branches/soc-2011-pepper/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-pepper/source/blender/imbuf/intern/indexer.c
branches/soc-2011-pepper/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_texture_api.c
Property Changed:
----------------
branches/soc-2011-pepper/
Property changes on: branches/soc-2011-pepper
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36830-39637
+ /trunk/blender:36830-39790
Modified: branches/soc-2011-pepper/CMakeLists.txt
===================================================================
--- branches/soc-2011-pepper/CMakeLists.txt 2011-08-30 07:57:55 UTC (rev 39790)
+++ branches/soc-2011-pepper/CMakeLists.txt 2011-08-30 08:22:03 UTC (rev 39791)
@@ -274,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
@@ -445,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)
@@ -684,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
@@ -832,7 +842,13 @@
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/gcc/opencollada)
- set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
+ set(OPENCOLLADA_INCLUDE_DIRS
+ ${LIBDIR}/gcc/opencollada/include/COLLADAStreamWriter/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADABaseUtils/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADAFramework/include
+ ${LIBDIR}/gcc/opencollada/include/COLLADASaxFrameworkLoader/include
+ ${LIBDIR}/gcc/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)
@@ -1043,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-pepper/SConstruct
===================================================================
--- branches/soc-2011-pepper/SConstruct 2011-08-30 07:57:55 UTC (rev 39790)
+++ branches/soc-2011-pepper/SConstruct 2011-08-30 08:22:03 UTC (rev 39791)
@@ -272,13 +272,13 @@
# for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
# necessary header file lives here when installed:
# /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
- if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
- print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
- env['WITH_BF_3DMOUSE'] = 0
- else:
- env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
+ if env['WITH_BF_3DMOUSE'] == 1:
+ if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
+ print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
+ env['WITH_BF_3DMOUSE'] = 0
+ else:
+ env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
-
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
Copied: branches/soc-2011-pepper/build_files/cmake/Modules/FindOpenCOLLADA.cmake (from rev 39790, trunk/blender/build_files/cmake/Modules/FindOpenCOLLADA.cmake)
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/Modules/FindOpenCOLLADA.cmake (rev 0)
+++ branches/soc-2011-pepper/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-08-30 08:22:03 UTC (rev 39791)
@@ -0,0 +1,118 @@
+# - 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)
Modified: branches/soc-2011-pepper/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2011-pepper/build_files/cmake/config/blender_lite.cmake 2011-08-30 07:57:55 UTC (rev 39790)
+++ branches/soc-2011-pepper/build_files/cmake/config/blender_lite.cmake 2011-08-30 08:22:03 UTC (rev 39791)
@@ -1,4 +1,4 @@
-# turn everything OFF CACHE FORCE BOOL) except for python which defaults to ON
+# turn everything OFF except for python which defaults to ON
# and is needed for the UI
#
# Example usage:
Modified: branches/soc-2011-pepper/build_files/cmake/packaging.cmake
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list