[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45309] branches/soc-2011-avocado/blender: post-merge cleanup
Andrea Weikert
elubie at gmx.net
Sat Mar 31 16:56:05 CEST 2012
Revision: 45309
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45309
Author: elubie
Date: 2012-03-31 14:56:00 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
post-merge cleanup
* fixing some line endings (adding svn properties)
Modified 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/cmake_consistency_check_config.py
Property Changed:
----------------
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/FindSndFile.cmake
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/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/soc-2011-avocado/blender/source/blender/makesrna/rna_cleanup/rna_update.sh
branches/soc-2011-avocado/blender/source/blender/python/rna_dump.py
branches/soc-2011-avocado/blender/source/blender/python/simple_enum_gen.py
Modified: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindFftw3.cmake
===================================================================
--- branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindFftw3.cmake 2012-03-31 14:22:22 UTC (rev 45308)
+++ branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindFftw3.cmake 2012-03-31 14:56:00 UTC (rev 45309)
@@ -1,70 +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
-)
+# - 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
+)
Modified: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJack.cmake
===================================================================
--- branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJack.cmake 2012-03-31 14:22:22 UTC (rev 45308)
+++ branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJack.cmake 2012-03-31 14:56:00 UTC (rev 45309)
@@ -1,70 +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
-)
+# - 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
+)
Property changes on: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindJeMalloc.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindOpenEXR.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindOpenJPEG.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-avocado/blender/build_files/cmake/Modules/FindSndFile.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2011-avocado/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/soc-2011-avocado/blender/build_files/cmake/cmake_consistency_check_config.py 2012-03-31 14:22:22 UTC (rev 45308)
+++ branches/soc-2011-avocado/blender/build_files/cmake/cmake_consistency_check_config.py 2012-03-31 14:56:00 UTC (rev 45309)
@@ -49,14 +49,6 @@
"extern/recastnavigation/Recast/Include/RecastTimer.h",
"intern/audaspace/SRC/AUD_SRCResampleFactory.h",
"intern/audaspace/SRC/AUD_SRCResampleReader.h",
-
- # for bmesh branch only
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list