[patch] a patch1 for files/

shiboken1-python3.patch (text/plain), 2.13 KB, created by Ian Delaney (RETIRED) on 2012-02-24 14:30:16 UTC

diff -ur shiboken-1.1.0.orig/cmake/Modules/FindPython3Libs.cmake shiboken-1.1.0/cmake/Modules/FindPython3Libs.cmake
--- cmake/Modules/FindPython3Libs.cmake	2011-12-31 02:27:12.000000000 +0800
+++ cmake/Modules/FindPython3Libs.cmake	2012-02-24 19:02:04.240299089 +0800
@@ -26,14 +26,11 @@
 # Is there a python3 framework? How do we search for it?
 # Search for the python framework on Apple.
 # CMAKE_FIND_FRAMEWORKS(Python)
-
+set(_Python_VERSIONS
+  ${Python_ADDITIONAL_VERSIONS} 3.2)
+  
 FOREACH(_CURRENT_VERSION 3.2 3.1 3.0)
-  IF(_CURRENT_VERSION GREATER 3.1)
-      SET(_32FLAGS "m" "u" "mu" "")
-  ELSE()
-      SET(_32FLAGS "")
-  ENDIF()
-  FOREACH(_COMPILATION_FLAGS ${_32FLAGS})
+  FOREACH(_COMPILATION_FLAGS "m" "u" "mu" "")
       STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
       IF(WIN32)
         IF(_CURRENT_VERSION GREATER 3.1)
@@ -52,7 +49,7 @@
       ENDIF(WIN32)
 
       FIND_LIBRARY(PYTHON3_LIBRARY
-          NAMES python${_CURRENT_VERSION_NO_DOTS}${_COMPILATION_FLAGS} python${_CURRENT_VERSION}${_COMPILATION_FLAGS}
+          NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
         PATHS
           [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
           # Avoid finding the .dll in the PATH.  We want the .lib.
@@ -60,7 +57,7 @@
       )
       # Look for the static library in the Python config directory
       FIND_LIBRARY(PYTHON3_LIBRARY
-        NAMES python${_CURRENT_VERSION_NO_DOTS}${_COMPILATION_FLAGS} python${_CURRENT_VERSION}${_COMPILATION_FLAGS}
+        NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
         # Avoid finding the .dll in the PATH.  We want the .lib.
         NO_SYSTEM_ENVIRONMENT_PATH
         # This is where the static library is usually located
@@ -99,7 +96,7 @@
           ${PYTHON_FRAMEWORK_INCLUDES}
           [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
         PATH_SUFFIXES
-        python${_CURRENT_VERSION}${_COMPILATION_FLAGS}
+        python${_CURRENT_VERSION}
       )
 
       # For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal.