Merge branch 'policy-CMP0017' into resolve/python-versions/policy-CMP0017

Conflicts:
	Modules/FindPythonInterp.cmake
This commit is contained in:
Brad King
2011-01-11 15:56:59 -05:00
96 changed files with 315 additions and 143 deletions

View File

@@ -45,7 +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)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonInterp DEFAULT_MSG PYTHON_EXECUTABLE)
mark_as_advanced(PYTHON_EXECUTABLE)