[Python-modules-commits] r11459 - in packages/pyside/trunk/debian/patches (1 file)

[odyx-guest at users.alioth.debian.org]

    Date: Saturday, January 30, 2010 @ 15:59:10
  Author: odyx-guest
Revision: 11459

Improve multiple_python_versions.patch

Modified:
  packages/pyside/trunk/debian/patches/multiple_python_versions.patch

Modified: packages/pyside/trunk/debian/patches/multiple_python_versions.patch
===================================================================
--- packages/pyside/trunk/debian/patches/multiple_python_versions.patch	2010-01-30 15:34:35 UTC (rev 11458)
+++ packages/pyside/trunk/debian/patches/multiple_python_versions.patch	2010-01-30 15:59:10 UTC (rev 11459)
@@ -1,16 +1,16 @@
 Description: Allow multiple python versions (taken from the Gammu CMakeLists.txt)
 Author: Didier Raboud <didier at raboud.com>
-Last-Update: 2010-01-21
+Last-Update: 2010-01-29
 Origin: vendor
 
-Index: pyside-0.2.3/CMakeLists.txt
+Index: pyside-qt4.6+0.2.3/CMakeLists.txt
 ===================================================================
---- pyside-0.2.3.orig/CMakeLists.txt	2009-12-17 23:05:13.000000000 +0100
-+++ pyside-0.2.3/CMakeLists.txt	2010-01-21 13:53:42.000000000 +0100
-@@ -19,8 +19,39 @@
+--- pyside-qt4.6+0.2.3.orig/CMakeLists.txt	2010-01-30 00:53:55.000000000 +0100
++++ pyside-qt4.6+0.2.3/CMakeLists.txt	2010-01-30 00:54:25.000000000 +0100
+@@ -18,9 +18,41 @@
+     endif(CMAKE_HOST_APPLE)
  endif(CMAKE_HOST_UNIX)
  
- find_package(Boost 1.38.0 COMPONENTS python REQUIRED)
 +# Select the Python Executable (Taken from the Gammu CMakeLists.txt)
 +if (BUILD_PYTHON)
 +    find_program(PYTHON_EXECUTABLE ${BUILD_PYTHON})
@@ -22,16 +22,8 @@
 +        OUTPUT_STRIP_TRAILING_WHITESPACE
 +        )
 +    string (REPLACE "." "" PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
-+    find_library (PYTHON_LIBRARY
-+        NAMES python${PYTHON_VERSION_NO_DOTS} python${PYTHON_VERSION}
-+        PATH_SUFFIXES
-+          python${PYTHON_VERSION}/config
-+        )
-+    find_path(PYTHON_INCLUDE_PATH
-+        NAMES Python.h
-+        PATH_SUFFIXES
-+         python${PYTHON_VERSION}
-+        )
++    set(PYTHON_LIBRARY "/usr/lib/libpython${PYTHON_VERSION}${CMAKE_DEBUG_POSTFIX}.so")
++    set(PYTHON_INCLUDE_PATH "/usr/include/python${PYTHON_VERSION}/")
 +    mark_as_advanced(
 +      PYTHON_LIBRARY
 +      PYTHON_INCLUDE_PATH
@@ -40,7 +32,17 @@
 +
 +    message (STATUS "Found PythonLibs: ${PYTHON_LIBRARIES}")
 +    message (STATUS "Found PythonInterp: ${PYTHON_EXECUTABLE}")
++
++    # Also try to find the correct Boost version
++
++    SET(Boost_INCLUDE_DIR "/usr/include" CACHE PATH "Path to a file")
++    SET(Boost_LIBRARY_DIRS "/usr/lib" CACHE FILEPATH "Boost library directory")
++    SET(Boost_PYTHON_LIBRARY "/usr/lib/libboost_python-py${PYTHON_VERSION_NO_DOTS}.so" CACHE FILEPATH "The Boost PYTHON library")
++
++    message (STATUS "Found Boost Python library: ${Boost_PYTHON_LIBRARY}")
++
 +else (BUILD_PYTHON)
+ find_package(Boost 1.38.0 COMPONENTS python REQUIRED)
  find_package(PythonLibs REQUIRED)
  find_package(PythonInterp REQUIRED)
 +endif (BUILD_PYTHON)