[Cmake-commits] CMake branch, next, updated. v2.8.3-1311-g9cafd55

[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  9cafd5555412c619364ba36ddd9f34f0b40aa211 (commit)
       via  784d5ce0f8bf630901dece526df7ce663da17e6a (commit)
      from  68a411cbe48d1a7fed01f53ba017fafcc7159cc5 (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=9cafd5555412c619364ba36ddd9f34f0b40aa211
commit 9cafd5555412c619364ba36ddd9f34f0b40aa211
Merge: 68a411c 784d5ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 11 15:58:40 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 11 15:58:40 2011 -0500

    Merge topic 'resolve/python-versions/policy-CMP0017' into next
    
    784d5ce Merge branch 'policy-CMP0017' into resolve/python-versions/policy-CMP0017


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=784d5ce0f8bf630901dece526df7ce663da17e6a
commit 784d5ce0f8bf630901dece526df7ce663da17e6a
Merge: 2d3594b ce28737
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 11 15:56:59 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 11 15:56:59 2011 -0500

    Merge branch 'policy-CMP0017' into resolve/python-versions/policy-CMP0017
    
    Conflicts:
    	Modules/FindPythonInterp.cmake

diff --cc Modules/FindPythonInterp.cmake
index f2c116f,6c97ba3..3592e4c
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@@ -45,7 -36,8 +45,7 @@@ endif(
  
  # handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if
  # all listed variables are TRUE
- include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake")
 -INCLUDE(FindPackageHandleStandardArgs)
++include(FindPackageHandleStandardArgs)
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonInterp DEFAULT_MSG PYTHON_EXECUTABLE)
  
 -MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
 -
 +mark_as_advanced(PYTHON_EXECUTABLE)

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

Summary of changes:


hooks/post-receive
-- 
CMake