[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37659] trunk/blender/build_files/cmake/ Modules/FindPythonLibsUnix.cmake: fix for python ABI search, was missing 'd '

[Campbell Barton]

Revision: 37659
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37659
Author:   campbellbarton
Date:     2011-06-20 09:39:14 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
fix for python ABI search, was missing 'd'

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-20 09:34:35 UTC (rev 37658)
+++ trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2011-06-20 09:39:14 UTC (rev 37659)
@@ -34,8 +34,11 @@
   SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
 ENDIF()
 
-
-SET(PYTHON_VERSION 3.2 CACHE STRING "")
+IF(DEFINED PYTHON_VERSION)
+  SET(PYTHON_VERSION "${PYTHON_VERSION}" CACHE STRING "")
+ELSE()
+  SET(PYTHON_VERSION 3.2 CACHE STRING "")
+ENDIF()
 MARK_AS_ADVANCED(PYTHON_VERSION)
 
 SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
@@ -43,7 +46,7 @@
 
 SET(_python_ABI_FLAGS
   "m;mu;u; "  # release
-  "md;mud;ud" # debug
+  "md;mud;ud;d" # debug
 )
 
 STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
@@ -61,15 +64,21 @@
   STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
 
   FIND_PATH(PYTHON_INCLUDE_DIR
-    NAMES Python.h
-    HINTS ${_python_SEARCH_DIRS}
-    PATH_SUFFIXES include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
+    NAMES
+      Python.h
+    HINTS
+      ${_python_SEARCH_DIRS}
+    PATH_SUFFIXES
+      include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
   )
 
   FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
-    HINTS ${_python_SEARCH_DIRS}
-    PATH_SUFFIXES lib64 lib
+    NAMES
+      "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
+    HINTS
+      ${_python_SEARCH_DIRS}
+    PATH_SUFFIXES
+      lib64 lib
   )
 
   IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)