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

@@ -104,7 +104,7 @@ SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake")
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs DEFAULT_MSG PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS)