[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37636] trunk/blender/build_files/cmake/ Modules/FindPythonLibsUnix.cmake: add back PYTHON_LIBPATH, needed for installing on python
Campbell Barton
ideasman42 at gmail.com
Sun Jun 19 13:04:15 CEST 2011
Revision: 37636
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37636
Author: campbellbarton
Date: 2011-06-19 11:04:15 +0000 (Sun, 19 Jun 2011)
Log Message:
-----------
add back PYTHON_LIBPATH, needed for installing on python
Modified Paths:
--------------
trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
Modified: trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-06-19 10:19:10 UTC (rev 37635)
+++ trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-06-19 11:04:15 UTC (rev 37636)
@@ -3,6 +3,7 @@
# PYTHON_VERSION
# PYTHON_INCLUDE_DIRS
# PYTHON_LIBRARIES
+# PYTHON_LIBPATH, Used for installation
# PYTHON_LINKFLAGS
# PYTHON_ROOT_DIR, The base directory to search for Python.
# This can also be an environment variable.
@@ -46,18 +47,18 @@
PATH_SUFFIXES include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
)
- find_library(PYTHON_LIBRARIES
+ find_library(PYTHON_LIBRARY
NAMES "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
HINTS ${_python_SEARCH_DIRS}
PATH_SUFFIXES lib64 lib
)
- if(PYTHON_LIBRARIES AND PYTHON_INCLUDE_DIR)
+ if(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
break()
else()
# ensure we dont find values from 2 different ABI versions
unset(PYTHON_INCLUDE_DIR CACHE)
- unset(PYTHON_LIBRARIES CACHE)
+ unset(PYTHON_LIBRARY CACHE)
endif()
endforeach()
@@ -71,13 +72,17 @@
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix DEFAULT_MSG
- PYTHON_LIBRARIES PYTHON_INCLUDE_DIR)
+ PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
if(PYTHONLIBSUNIX_FOUND)
# Assign cache items
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} CACHE STRING "")
- set(PYTHON_LIBRARIES ${PYTHON_LIBRARIES} CACHE STRING "")
+ set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} CACHE STRING "")
+
+ # we need this for installation
+ get_filename_component(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
+
# not used
# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
@@ -85,5 +90,7 @@
PYTHON_INCLUDE_DIRS
PYTHON_INCLUDE_DIR
PYTHON_LIBRARIES
+ PYTHON_LIBRARY
+ PYTHON_LIBPATH
)
endif()
More information about the Bf-blender-cvs
mailing list