From 36de5ba0cec93641727152060460e5fd76611d29 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 31 Aug 2014 22:46:50 +0200 Subject: [PATCH] Search for Python 3.4 in FindPython{Interp,Libs}. * Search for Python 3.4 in FindPython{Interp,Libs}. - Add search_for_python3.4.diff --- debian/changelog | 7 +++++ debian/patches/search_for_python3.4.diff | 37 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 45 insertions(+) create mode 100644 debian/patches/search_for_python3.4.diff diff --git a/debian/changelog b/debian/changelog index 70e81f85f..b18d5802a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cmake (2.8.12.2-2) UNRELEASED; urgency=medium + + * Search for Python 3.4 in FindPython{Interp,Libs}. + - Add search_for_python3.4.diff + + -- Felix Geyer Sun, 31 Aug 2014 21:27:28 +0200 + cmake (2.8.12.2-1) unstable; urgency=medium [ Felix Geyer ] diff --git a/debian/patches/search_for_python3.4.diff b/debian/patches/search_for_python3.4.diff new file mode 100644 index 000000000..6be79e5a4 --- /dev/null +++ b/debian/patches/search_for_python3.4.diff @@ -0,0 +1,37 @@ +From ab6201ab647c13fee44c44822b8502e9848faaaf Mon Sep 17 00:00:00 2001 +From: Matt McCormick +Date: Wed, 5 Mar 2014 17:41:47 -0500 +Subject: [PATCH] FindPython{Interp,Libs}: Search for Python 3.4. + +Python 3.4.0rnc1 was released on 2014-02-20. +--- + Modules/FindPythonInterp.cmake | 2 +- + Modules/FindPythonLibs.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake +index 8da848c..e23a58b 100644 +--- a/Modules/FindPythonInterp.cmake ++++ b/Modules/FindPythonInterp.cmake +@@ -33,7 +33,7 @@ unset(_Python_NAMES) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) + + if(PythonInterp_FIND_VERSION) + if(PythonInterp_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$") +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index 0749efc..1dbc967 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -38,7 +38,7 @@ CMAKE_FIND_FRAMEWORKS(Python) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) + + if(PythonLibs_FIND_VERSION) + if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$") diff --git a/debian/patches/series b/debian/patches/series index bc52d4fdb..65a48c00c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ fix-FindImageMagick-2.diff fix-FindFreetype-version.diff fix-hdf5-hl.patch FindJNI_ppc64le.diff +search_for_python3.4.diff