diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-10 13:36:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-10 13:36:31 (GMT) |
| commit | 9d4394ee872d6147d81564a8537e597a76f14bbd (patch) | |
| tree | ba1b0372b2e9af09bd5c3801ac59bd22d77da925 | |
| parent | 98e3831a67823af2aabab473a7920c96c6e502d1 (diff) | |
| parent | ab6201ab647c13fee44c44822b8502e9848faaaf (diff) | |
| download | CMake-9d4394ee872d6147d81564a8537e597a76f14bbd.zip CMake-9d4394ee872d6147d81564a8537e597a76f14bbd.tar.gz CMake-9d4394ee872d6147d81564a8537e597a76f14bbd.tar.bz2 | |
Merge branch 'python-3.4' into release
| -rw-r--r-- | Modules/FindPythonInterp.cmake | 2 | ||||
| -rw-r--r-- | 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 @@ -47,7 +47,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_COUNT GREATER 1) diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index 0749efc..1dbc967 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -51,7 +51,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_COUNT GREATER 1) |