Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 276220 | Differences between
and this patch

Collapse All | Expand All

(-)libopensync-plugin-python-0.36.orig/cmake/modules/FindPythonLibs.cmake (-2 / +5 lines)
Lines 39-45 Link Here
39
ENDIF(WIN32)
39
ENDIF(WIN32)
40
40
41
FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION}
41
FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION}
42
  NAMES python25 python2.5
42
  NAMES python26 python2.6
43
        python25 python2.5
43
        python24 python2.4
44
        python24 python2.4
44
        python23 python2.3
45
        python23 python2.3
45
        python22 python2.2
46
        python22 python2.2
Lines 59-64 Link Here
59
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
60
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
60
61
61
  PATH_SUFFIXES
62
  PATH_SUFFIXES
63
    python2.6/config
62
    python2.5/config
64
    python2.5/config
63
    python2.4/config
65
    python2.4/config
64
    python2.3/config
66
    python2.3/config
Lines 77-83 Link Here
77
SET(PYTHON_FRAMEWORK_INCLUDES)
79
SET(PYTHON_FRAMEWORK_INCLUDES)
78
IF(Python_FRAMEWORKS)
80
IF(Python_FRAMEWORKS)
79
  IF(NOT PYTHON_INCLUDE_PATH)
81
  IF(NOT PYTHON_INCLUDE_PATH)
80
    FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
82
    FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
81
      FOREACH(dir ${Python_FRAMEWORKS})
83
      FOREACH(dir ${Python_FRAMEWORKS})
82
        SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
84
        SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
83
          ${dir}/Versions/${version}/include/python${version})
85
          ${dir}/Versions/${version}/include/python${version})
Lines 102-107 Link Here
102
104
103
  PATH_SUFFIXES
105
  PATH_SUFFIXES
104
    ${PREFERRED_PYTHON_VERSION}
106
    ${PREFERRED_PYTHON_VERSION}
107
    python2.6
105
    python2.5
108
    python2.5
106
    python2.4
109
    python2.4
107
    python2.3
110
    python2.3

Return to bug 276220