[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51979] trunk/blender/build_files/cmake/ Modules/FindPythonLibsUnix.cmake: Attempt to fix problems with local built py caused by own r51976.
Bastien Montagne
montagne29 at wanadoo.fr
Wed Nov 7 13:24:06 CET 2012
Revision: 51979
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51979
Author: mont29
Date: 2012-11-07 12:24:03 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Attempt to fix problems with local built py caused by own r51976.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51976
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 2012-11-07 12:14:35 UTC (rev 51978)
+++ trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2012-11-07 12:24:03 UTC (rev 51979)
@@ -108,6 +108,10 @@
include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
include/x86_64-linux-gnu/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
)
+ IF(NOT PYTHON_INCLUDE_CONFIG_DIR AND PYTHON_INCLUDE_DIR)
+ # Fallback...
+ SET(PYTHON_INCLUDE_CONFIG_DIR ${PYTHON_INCLUDE_DIR})
+ ENDIF()
ENDIF()
IF(NOT DEFINED PYTHON_LIBRARY)
@@ -130,6 +134,10 @@
PATH_SUFFIXES
lib64 lib
)
+ IF(NOT PYTHON_LIBPATH AND PYTHON_LIBRARY)
+ # Fallback...
+ GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
+ ENDIF()
ENDIF()
IF(PYTHON_LIBRARY AND PYTHON_LIBPATH AND PYTHON_INCLUDE_DIR AND PYTHON_INCLUDE_CONFIG_DIR)
More information about the Bf-blender-cvs
mailing list