[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39560] branches/soc-2011-avocado/blender: committing files added during merge, this was missed in merging commit.
Andrea Weikert
elubie at gmx.net
Fri Aug 19 20:21:39 CEST 2011
Revision: 39560
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39560
Author: elubie
Date: 2011-08-19 18:21:38 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
committing files added during merge, this was missed in merging commit.
Added Paths:
-----------
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindFftw3.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJack.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJeMalloc.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindOpenEXR.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindOpenJPEG.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindSamplerate.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindSndFile.cmake
branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindSpacenav.cmake
branches/soc-2011-avocado/blender/doc/python_api/examples/aud.py
branches/soc-2011-avocado/blender/doc/python_api/examples/bge.constraints.py
branches/soc-2011-avocado/blender/doc/python_api/examples/bge.texture.1.py
branches/soc-2011-avocado/blender/doc/python_api/examples/bge.texture.py
branches/soc-2011-avocado/blender/doc/python_api/examples/blf.py
branches/soc-2011-avocado/blender/doc/python_api/examples/bpy.props.4.py
branches/soc-2011-avocado/blender/doc/python_api/rst/bge.constraints.rst
branches/soc-2011-avocado/blender/doc/python_api/rst/bge.texture.rst
branches/soc-2011-avocado/blender/doc/python_api/rst/bgl.rst
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerWin32.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_SystemSDL.h
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_WindowSDL.h
branches/soc-2011-avocado/blender/intern/ghost/test/CMakeLists.txt
branches/soc-2011-avocado/blender/release/scripts/templates/batch_export.py
branches/soc-2011-avocado/blender/release/scripts/templates/ui_menu.py
branches/soc-2011-avocado/blender/release/scripts/templates/ui_menu_simple.py
branches/soc-2011-avocado/blender/release/scripts/templates/ui_panel_simple.py
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_app_handlers.h
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_intern_string.c
branches/soc-2011-avocado/blender/source/blender/python/intern/bpy_intern_string.h
branches/soc-2011-avocado/blender/source/blender/windowmanager/WM_keymap.h
branches/soc-2011-avocado/blender/source/tests/check_deprecated.py
branches/soc-2011-avocado/blender/source/tools/MakeGLStipple.py
Added: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindFftw3.cmake
===================================================================
--- branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindFftw3.cmake (rev 0)
+++ branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindFftw3.cmake 2011-08-19 18:21:38 UTC (rev 39560)
@@ -0,0 +1,70 @@
+# - Find Fftw3 library
+# Find the native Fftw3 includes and library
+# This module defines
+# FFTW3_INCLUDE_DIRS, where to find fftw3.h, Set when
+# FFTW3_INCLUDE_DIR is found.
+# FFTW3_LIBRARIES, libraries to link against to use Fftw3.
+# FFTW3_ROOT_DIR, The base directory to search for Fftw3.
+# This can also be an environment variable.
+# FFTW3_FOUND, If false, do not try to use Fftw3.
+#
+# also defined, but not for general use are
+# FFTW3_LIBRARY, where to find the Fftw3 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.
+#=============================================================================
+
+# If FFTW3_ROOT_DIR was defined in the environment, use it.
+IF(NOT FFTW3_ROOT_DIR AND NOT $ENV{FFTW3_ROOT_DIR} STREQUAL "")
+ SET(FFTW3_ROOT_DIR $ENV{FFTW3_ROOT_DIR})
+ENDIF()
+
+SET(_fftw3_SEARCH_DIRS
+ ${FFTW3_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
+
+FIND_PATH(FFTW3_INCLUDE_DIR
+ NAMES
+ fftw3.h
+ HINTS
+ ${_fftw3_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include
+)
+
+FIND_LIBRARY(FFTW3_LIBRARY
+ NAMES
+ fftw3
+ HINTS
+ ${_fftw3_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+
+# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG
+ FFTW3_LIBRARY FFTW3_INCLUDE_DIR)
+
+IF(FFTW3_FOUND)
+ SET(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
+ SET(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
+ENDIF(FFTW3_FOUND)
+
+MARK_AS_ADVANCED(
+ FFTW3_INCLUDE_DIR
+ FFTW3_LIBRARY
+)
Added: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJack.cmake
===================================================================
--- branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJack.cmake (rev 0)
+++ branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJack.cmake 2011-08-19 18:21:38 UTC (rev 39560)
@@ -0,0 +1,70 @@
+# - Find Jack library
+# Find the native Jack includes and library
+# This module defines
+# JACK_INCLUDE_DIRS, where to find jack.h, Set when
+# JACK_INCLUDE_DIR is found.
+# JACK_LIBRARIES, libraries to link against to use Jack.
+# JACK_ROOT_DIR, The base directory to search for Jack.
+# This can also be an environment variable.
+# JACK_FOUND, If false, do not try to use Jack.
+#
+# also defined, but not for general use are
+# JACK_LIBRARY, where to find the Jack 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.
+#=============================================================================
+
+# If JACK_ROOT_DIR was defined in the environment, use it.
+IF(NOT JACK_ROOT_DIR AND NOT $ENV{JACK_ROOT_DIR} STREQUAL "")
+ SET(JACK_ROOT_DIR $ENV{JACK_ROOT_DIR})
+ENDIF()
+
+SET(_jack_SEARCH_DIRS
+ ${JACK_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
+
+FIND_PATH(JACK_INCLUDE_DIR
+ NAMES
+ jack.h
+ HINTS
+ ${_jack_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include/jack
+)
+
+FIND_LIBRARY(JACK_LIBRARY
+ NAMES
+ jack
+ HINTS
+ ${_jack_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+
+# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG
+ JACK_LIBRARY JACK_INCLUDE_DIR)
+
+IF(JACK_FOUND)
+ SET(JACK_LIBRARIES ${JACK_LIBRARY})
+ SET(JACK_INCLUDE_DIRS ${JACK_INCLUDE_DIR})
+ENDIF(JACK_FOUND)
+
+MARK_AS_ADVANCED(
+ JACK_INCLUDE_DIR
+ JACK_LIBRARY
+)
Added: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJeMalloc.cmake
===================================================================
--- branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJeMalloc.cmake (rev 0)
+++ branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJeMalloc.cmake 2011-08-19 18:21:38 UTC (rev 39560)
@@ -0,0 +1,70 @@
+# - Find JeMalloc library
+# Find the native JeMalloc includes and library
+# This module defines
+# JEMALLOC_INCLUDE_DIRS, where to find jemalloc.h, Set when
+# JEMALLOC_INCLUDE_DIR is found.
+# JEMALLOC_LIBRARIES, libraries to link against to use JeMalloc.
+# JEMALLOC_ROOT_DIR, The base directory to search for JeMalloc.
+# This can also be an environment variable.
+# JEMALLOC_FOUND, If false, do not try to use JeMalloc.
+#
+# also defined, but not for general use are
+# JEMALLOC_LIBRARY, where to find the JeMalloc 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.
+#=============================================================================
+
+# If JEMALLOC_ROOT_DIR was defined in the environment, use it.
+IF(NOT JEMALLOC_ROOT_DIR AND NOT $ENV{JEMALLOC_ROOT_DIR} STREQUAL "")
+ SET(JEMALLOC_ROOT_DIR $ENV{JEMALLOC_ROOT_DIR})
+ENDIF()
+
+SET(_jemalloc_SEARCH_DIRS
+ ${JEMALLOC_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
+
+FIND_PATH(JEMALLOC_INCLUDE_DIR
+ NAMES
+ jemalloc.h
+ HINTS
+ ${_jemalloc_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include/jemalloc
+)
+
+FIND_LIBRARY(JEMALLOC_LIBRARY
+ NAMES
+ jemalloc
+ HINTS
+ ${_jemalloc_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+
+# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG
+ JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR)
+
+IF(JEMALLOC_FOUND)
+ SET(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY})
+ SET(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
+ENDIF(JEMALLOC_FOUND)
+
+MARK_AS_ADVANCED(
+ JEMALLOC_INCLUDE_DIR
+ JEMALLOC_LIBRARY
+)
Added: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
--- branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindOpenEXR.cmake (rev 0)
+++ branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindOpenEXR.cmake 2011-08-19 18:21:38 UTC (rev 39560)
@@ -0,0 +1,92 @@
+# - Find OpenEXR library
+# Find the native OpenEXR includes and library
+# This module defines
+# OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
+# OPENEXR_INCLUDE_DIR is found.
+# OPENEXR_LIBRARIES, libraries to link against to use OpenEXR.
+# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
+# This can also be an environment variable.
+# OPENEXR_FOUND, If false, do not try to use OpenEXR.
+#
+# For indervidual library access these advanced settings are available
+# OPENEXR_HALF_LIBRARY, Path to Half library
+# OPENEXR_IEX_LIBRARY, Path to Half library
+# OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
+# OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
+# OPENEXR_IMATH_LIBRARY, Path to Imath library
+#
+# also defined, but not for general use are
+# OPENEXR_LIBRARY, where to find the OpenEXR 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.
+#=============================================================================
+
+# If OPENEXR_ROOT_DIR was defined in the environment, use it.
+IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
+ SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
+ENDIF()
+
+SET(_openexr_FIND_COMPONENTS
+ Half
+ Iex
+ IlmImf
+ IlmThread
+ Imath
+)
+
+SET(_openexr_SEARCH_DIRS
+ ${OPENEXR_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
+
+FIND_PATH(OPENEXR_INCLUDE_DIR
+ NAMES
+ ImfXdr.h
+ HINTS
+ ${_openexr_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include/OpenEXR
+)
+
+SET(_openexr_LIBRARIES)
+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+
+ FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
+ NAMES
+ ${COMPONENT}
+ HINTS
+ ${_openexr_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+ LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
+ENDFOREACH()
+
+# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
+ _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
+
+IF(OPENEXR_FOUND)
+ SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
+ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
+ENDIF()
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list