[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37649] trunk/blender: - add example for python rna property update
Campbell Barton
ideasman42 at gmail.com
Mon Jun 20 04:54:57 CEST 2011
Revision: 37649
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37649
Author: campbellbarton
Date: 2011-06-20 02:54:56 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
- add example for python rna property update
- edit the copyright for blender specific cmake find modules
Modified Paths:
--------------
trunk/blender/build_files/cmake/Modules/FindFftw3.cmake
trunk/blender/build_files/cmake/Modules/FindJack.cmake
trunk/blender/build_files/cmake/Modules/FindJeMalloc.cmake
trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake
trunk/blender/build_files/cmake/Modules/FindOpenJPEG.cmake
trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
trunk/blender/build_files/cmake/Modules/FindSamplerate.cmake
trunk/blender/build_files/cmake/Modules/FindSndFile.cmake
Added Paths:
-----------
trunk/blender/doc/python_api/examples/bpy.props.4.py
Modified: trunk/blender/build_files/cmake/Modules/FindFftw3.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindFftw3.cmake 2011-06-20 02:37:13 UTC (rev 37648)
+++ trunk/blender/build_files/cmake/Modules/FindFftw3.cmake 2011-06-20 02:54:56 UTC (rev 37649)
@@ -12,7 +12,7 @@
# FFTW3_LIBRARY, where to find the Fftw3 library.
#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
+# Copyright 2011 Blender Foundation.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -21,8 +21,6 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# If FFTW3_ROOT_DIR was defined in the environment, use it.
IF(NOT FFTW3_ROOT_DIR AND NOT $ENV{FFTW3_ROOT_DIR} STREQUAL "")
@@ -37,7 +35,9 @@
/opt/csw # Blastwave
)
-FIND_PATH(FFTW3_INCLUDE_DIR fftw3.h
+FIND_PATH(FFTW3_INCLUDE_DIR
+ NAMES
+ fftw3.h
HINTS
${_fftw3_SEARCH_DIRS}
PATH_SUFFIXES
@@ -45,9 +45,12 @@
)
FIND_LIBRARY(FFTW3_LIBRARY
- NAMES "fftw3"
- HINTS ${_fftw3_SEARCH_DIRS}
- PATH_SUFFIXES lib64 lib
+ NAMES
+ fftw3
+ HINTS
+ ${_fftw3_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
)
# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if
Modified: trunk/blender/build_files/cmake/Modules/FindJack.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindJack.cmake 2011-06-20 02:37:13 UTC (rev 37648)
+++ trunk/blender/build_files/cmake/Modules/FindJack.cmake 2011-06-20 02:54:56 UTC (rev 37649)
@@ -12,7 +12,7 @@
# JACK_LIBRARY, where to find the Jack library.
#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
+# Copyright 2011 Blender Foundation.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -21,8 +21,6 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# If JACK_ROOT_DIR was defined in the environment, use it.
IF(NOT JACK_ROOT_DIR AND NOT $ENV{JACK_ROOT_DIR} STREQUAL "")
@@ -37,7 +35,9 @@
/opt/csw # Blastwave
)
-FIND_PATH(JACK_INCLUDE_DIR jack.h
+FIND_PATH(JACK_INCLUDE_DIR
+ NAMES
+ jack.h
HINTS
${_jack_SEARCH_DIRS}
PATH_SUFFIXES
@@ -45,9 +45,12 @@
)
FIND_LIBRARY(JACK_LIBRARY
- NAMES "jack"
- HINTS ${_jack_SEARCH_DIRS}
- PATH_SUFFIXES lib64 lib
+ NAMES
+ jack
+ HINTS
+ ${_jack_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
)
# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if
Modified: trunk/blender/build_files/cmake/Modules/FindJeMalloc.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindJeMalloc.cmake 2011-06-20 02:37:13 UTC (rev 37648)
+++ trunk/blender/build_files/cmake/Modules/FindJeMalloc.cmake 2011-06-20 02:54:56 UTC (rev 37649)
@@ -12,7 +12,7 @@
# JEMALLOC_LIBRARY, where to find the JeMalloc library.
#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
+# Copyright 2011 Blender Foundation.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -21,8 +21,6 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# If JEMALLOC_ROOT_DIR was defined in the environment, use it.
IF(NOT JEMALLOC_ROOT_DIR AND NOT $ENV{JEMALLOC_ROOT_DIR} STREQUAL "")
@@ -37,7 +35,9 @@
/opt/csw # Blastwave
)
-FIND_PATH(JEMALLOC_INCLUDE_DIR jemalloc.h
+FIND_PATH(JEMALLOC_INCLUDE_DIR
+ NAMES
+ jemalloc.h
HINTS
${_jemalloc_SEARCH_DIRS}
PATH_SUFFIXES
@@ -45,9 +45,12 @@
)
FIND_LIBRARY(JEMALLOC_LIBRARY
- NAMES "jemalloc"
- HINTS ${_jemalloc_SEARCH_DIRS}
- PATH_SUFFIXES lib64 lib
+ NAMES
+ jemalloc
+ HINTS
+ ${_jemalloc_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
)
# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if
Modified: trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake 2011-06-20 02:37:13 UTC (rev 37648)
+++ trunk/blender/build_files/cmake/Modules/FindOpenEXR.cmake 2011-06-20 02:54:56 UTC (rev 37649)
@@ -19,7 +19,7 @@
# OPENEXR_LIBRARY, where to find the OpenEXR library.
#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
+# Copyright 2011 Blender Foundation.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -28,8 +28,6 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# If OPENEXR_ROOT_DIR was defined in the environment, use it.
IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
@@ -52,7 +50,9 @@
/opt/csw # Blastwave
)
-FIND_PATH(OPENEXR_INCLUDE_DIR ImfXdr.h
+FIND_PATH(OPENEXR_INCLUDE_DIR
+ NAMES
+ ImfXdr.h
HINTS
${_openexr_SEARCH_DIRS}
PATH_SUFFIXES
@@ -64,10 +64,13 @@
STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
- NAMES ${COMPONENT}
- HINTS ${_openexr_SEARCH_DIRS}
- PATH_SUFFIXES lib64 lib
- )
+ NAMES
+ ${COMPONENT}
+ HINTS
+ ${_openexr_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
ENDFOREACH()
Modified: trunk/blender/build_files/cmake/Modules/FindOpenJPEG.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindOpenJPEG.cmake 2011-06-20 02:37:13 UTC (rev 37648)
+++ trunk/blender/build_files/cmake/Modules/FindOpenJPEG.cmake 2011-06-20 02:54:56 UTC (rev 37649)
@@ -12,7 +12,7 @@
# OPENJPEG_LIBRARY, where to find the OpenJPEG library.
#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
+# Copyright 2011 Blender Foundation.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -21,8 +21,6 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
# If OPENJPEG_ROOT_DIR was defined in the environment, use it.
IF(NOT OPENJPEG_ROOT_DIR AND NOT $ENV{OPENJPEG_ROOT_DIR} STREQUAL "")
@@ -37,7 +35,9 @@
/opt/csw # Blastwave
)
-FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
+FIND_PATH(OPENJPEG_INCLUDE_DIR
+ NAMES
+ openjpeg.h
HINTS
${_openjpeg_SEARCH_DIRS}
PATH_SUFFIXES
@@ -45,9 +45,12 @@
)
FIND_LIBRARY(OPENJPEG_LIBRARY
- NAMES "openjpeg"
- HINTS ${_openjpeg_SEARCH_DIRS}
- PATH_SUFFIXES lib64 lib
+ NAMES
+ openjpeg
+ HINTS
+ ${_openjpeg_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
)
# handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if
Modified: trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-06-20 02:37:13 UTC (rev 37648)
+++ trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-06-20 02:54:56 UTC (rev 37649)
@@ -1,5 +1,12 @@
-# - Find python libraries
+# - Find Python libraries
+# Find the native Python includes and library
#
+# Note:, This is not _yet_ intended to be a general python module for other
+# projects to use since its hard coded to python 3.2 as blender only supports
+# a single python version.
+# This is for blender/unix python only.
+#
+# This module defines
# PYTHON_VERSION
# PYTHON_INCLUDE_DIRS
# PYTHON_LIBRARIES
@@ -7,87 +14,99 @@
# PYTHON_LINKFLAGS
# PYTHON_ROOT_DIR, The base directory to search for Python.
# This can also be an environment variable.
+#
+# also defined, but not for general use are
+# PYTHON_LIBRARY, where to find the python 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 PYTHON_ROOT_DIR was defined in the environment, use it.
-if(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} STREQUAL "")
- set(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
-endif()
+IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} STREQUAL "")
+ SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
+ENDIF()
-set(PYTHON_VERSION 3.2 CACHE STRING "")
-mark_as_advanced(PYTHON_VERSION)
+SET(PYTHON_VERSION 3.2 CACHE STRING "")
+MARK_AS_ADVANCED(PYTHON_VERSION)
-set(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
-mark_as_advanced(PYTHON_LINKFLAGS)
+SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list