[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52047] trunk/blender/build_files/cmake/ Modules/FindPythonLibsUnix.cmake: Another fix for finding python stuff...

[Bastien Montagne]

Revision: 52047
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52047
Author:   mont29
Date:     2012-11-09 20:38:09 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Another fix for finding python stuff... Should work for everyone now! (I hope...).

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-09 18:31:04 UTC (rev 52046)
+++ trunk/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2012-11-09 20:38:09 UTC (rev 52047)
@@ -108,9 +108,10 @@
           include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
           include/${CMAKE_LIBRARY_ARCHITECTURE}/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
       )
-      IF(NOT PYTHON_INCLUDE_CONFIG_DIR AND PYTHON_INCLUDE_DIR)
+      IF((NOT PYTHON_INCLUDE_CONFIG_DIR) AND PYTHON_INCLUDE_DIR)
         # Fallback...
-        SET(PYTHON_INCLUDE_CONFIG_DIR ${PYTHON_INCLUDE_DIR})
+        UNSET(PYTHON_INCLUDE_CONFIG_DIR CACHE)
+        SET(PYTHON_INCLUDE_CONFIG_DIR ${PYTHON_INCLUDE_DIR} CACHE PATH "")
       ENDIF()
     ENDIF()
 
@@ -134,8 +135,9 @@
         PATH_SUFFIXES
           lib64 lib
       )
-      IF(NOT PYTHON_LIBPATH AND PYTHON_LIBRARY)
+      IF((NOT PYTHON_LIBPATH) AND PYTHON_LIBRARY)
         # Fallback...
+        UNSET(PYTHON_LIBPATH CACHE)
         GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
       ENDIF()
     ENDIF()
@@ -177,7 +179,6 @@
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix  DEFAULT_MSG
     PYTHON_LIBRARY PYTHON_LIBPATH PYTHON_INCLUDE_DIR PYTHON_INCLUDE_CONFIG_DIR)
 
-
 IF(PYTHONLIBSUNIX_FOUND)
   # Assign cache items
   SET(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_CONFIG_DIR})