[Cmake-commits] CMake branch, next, updated. v3.3.1-2977-g7dc04f4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7dc04f4f901934e28bba3acf45931d53458b469e (commit)
       via  c57334fae9c1b007d227d81f1078706d1399746f (commit)
       via  2db092b1f60b3677a2d44d5563bec216ae687e2f (commit)
      from  962583a78c051c31ce158fb3a6de2eb8fef7d091 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7dc04f4f901934e28bba3acf45931d53458b469e
commit 7dc04f4f901934e28bba3acf45931d53458b469e
Merge: 962583a c57334f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 16 09:03:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 16 09:03:24 2015 -0400

    Merge topic 'FindPython-updates' into next
    
    c57334fa FindPythonLibs: Remove PYTHON_INCLUDE_PATH as input
    2db092b1 FindPython{Interp,Libs}: Add versions 3.5 and 3.6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c57334fae9c1b007d227d81f1078706d1399746f
commit c57334fae9c1b007d227d81f1078706d1399746f
Author:     David Gobbi <david.gobbi at gmail.com>
AuthorDate: Mon Sep 14 22:44:15 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 16 08:59:59 2015 -0400

    FindPythonLibs: Remove PYTHON_INCLUDE_PATH as input
    
    This cmake variable has been deprecated for over a decade, and using it
    as an input could potentially cause unexpected results.  We still need
    to keep it as an output variable for compatibility though.

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index d01fae4..127662d 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -150,13 +150,6 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
     PATH_SUFFIXES python${_CURRENT_VERSION}/config
   )
 
-  # For backward compatibility, honour value of PYTHON_INCLUDE_PATH, if
-  # PYTHON_INCLUDE_DIR is not set.
-  if(DEFINED PYTHON_INCLUDE_PATH AND NOT DEFINED PYTHON_INCLUDE_DIR)
-    set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_PATH}" CACHE PATH
-      "Path to where Python.h is found" FORCE)
-  endif()
-
   set(PYTHON_FRAMEWORK_INCLUDES)
   if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
     foreach(dir ${Python_FRAMEWORKS})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2db092b1f60b3677a2d44d5563bec216ae687e2f
commit 2db092b1f60b3677a2d44d5563bec216ae687e2f
Author:     David Gobbi <david.gobbi at gmail.com>
AuthorDate: Mon Sep 14 21:44:36 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 16 08:54:04 2015 -0400

    FindPython{Interp,Libs}: Add versions 3.5 and 3.6

diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 8784e18..879192e 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -51,7 +51,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.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.6 3.5 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 b80d3ce..d01fae4 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -64,7 +64,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
 
 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.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonLibs_FIND_VERSION)
     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPythonInterp.cmake |    2 +-
 Modules/FindPythonLibs.cmake   |    9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake