FindPythonLibs: put debug libraries into PYTHON_LIBRARIES
This commit is contained in:
parent
c9c1a17609
commit
91d5a2a386
|
@ -7,7 +7,7 @@
|
||||||
# PYTHON_LIBRARIES - path to the python library
|
# PYTHON_LIBRARIES - path to the python library
|
||||||
# PYTHON_INCLUDE_PATH - path to where Python.h is found (deprecated)
|
# PYTHON_INCLUDE_PATH - path to where Python.h is found (deprecated)
|
||||||
# PYTHON_INCLUDE_DIRS - path to where Python.h is found
|
# PYTHON_INCLUDE_DIRS - path to where Python.h is found
|
||||||
# PYTHON_DEBUG_LIBRARIES - path to the debug library
|
# PYTHON_DEBUG_LIBRARIES - path to the debug library (deprecated)
|
||||||
# PYTHONLIBS_VERSION_STRING - version of the Python libs found (since CMake 2.8.8)
|
# PYTHONLIBS_VERSION_STRING - version of the Python libs found (since CMake 2.8.8)
|
||||||
#
|
#
|
||||||
# The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
|
# The Python_ADDITIONAL_VERSIONS variable can be used to specify a list of
|
||||||
|
@ -134,7 +134,6 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
|
||||||
PYTHONLIBS_VERSION_STRING "${python_version_str}")
|
PYTHONLIBS_VERSION_STRING "${python_version_str}")
|
||||||
UNSET(python_version_str)
|
UNSET(python_version_str)
|
||||||
ENDIF(PYTHON_INCLUDE_DIR AND EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
|
ENDIF(PYTHON_INCLUDE_DIR AND EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
|
||||||
|
|
||||||
ENDFOREACH(_CURRENT_VERSION)
|
ENDFOREACH(_CURRENT_VERSION)
|
||||||
|
|
||||||
MARK_AS_ADVANCED(
|
MARK_AS_ADVANCED(
|
||||||
|
@ -148,9 +147,18 @@ MARK_AS_ADVANCED(
|
||||||
# library. We now set the variables listed by the documentation for this
|
# library. We now set the variables listed by the documentation for this
|
||||||
# module.
|
# module.
|
||||||
SET(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
|
SET(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
|
||||||
SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
|
|
||||||
SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
|
SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
|
||||||
|
|
||||||
|
# These variables have been historically named in this module different from
|
||||||
|
# what SELECT_LIBRARY_CONFIGURATIONS() expects.
|
||||||
|
SET(PYTHON_LIBRARY_DEBUG "${PYTHON_DEBUG_LIBRARY}")
|
||||||
|
SET(PYTHON_LIBRARY_RELEASE "${PYTHON_LIBRARY}")
|
||||||
|
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
|
||||||
|
SELECT_LIBRARY_CONFIGURATIONS(PYTHON)
|
||||||
|
# SELECT_LIBRARY_CONFIGURATIONS() sets ${PREFIX}_FOUND if it has a library.
|
||||||
|
# Unset this, this prefix doesn't match the module prefix, they are different
|
||||||
|
# for historical reasons.
|
||||||
|
UNSET(PYTHON_FOUND)
|
||||||
|
|
||||||
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs
|
||||||
|
|
Loading…
Reference in New Issue