Change FindPythonLibs to use the standard _DIR instead of _PATH but stay backwards compatible

This commit is contained in:
Bill Hoffman 2009-09-14 09:34:57 -04:00
parent c32ad6ce32
commit da29eb892b

View File

@ -3,10 +3,11 @@
# include files and libraries are. It also determines what the name of # include files and libraries are. It also determines what the name of
# the library is. This code sets the following variables: # the library is. This code sets the following variables:
# #
# PYTHONLIBS_FOUND = have the Python libs been found # PYTHONLIBS_FOUND - have the Python libs been found
# PYTHON_LIBRARIES = path to the python library # PYTHON_LIBRARIES - path to the python library
# PYTHON_INCLUDE_PATH = path to where Python.h is found # PYTHON_INCLUDE_PATH - path to where Python.h is found (deprecated)
# PYTHON_DEBUG_LIBRARIES = path to the debug library # PYTHON_INCLUDE_DIRS - path to where Python.h is found
# PYTHON_DEBUG_LIBRARIES - path to the debug library
# #
INCLUDE(CMakeFindFrameworks) INCLUDE(CMakeFindFrameworks)
@ -33,15 +34,22 @@ FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
NO_SYSTEM_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
) )
# 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(DEFINED PYTHON_INCLUDE_PATH AND NOT DEFINED PYTHON_INCLUDE_DIR)
SET(PYTHON_FRAMEWORK_INCLUDES) SET(PYTHON_FRAMEWORK_INCLUDES)
IF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_PATH) IF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
FOREACH(dir ${Python_FRAMEWORKS}) FOREACH(dir ${Python_FRAMEWORKS})
SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES} SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION}) ${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION})
ENDFOREACH(dir) ENDFOREACH(dir)
ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_PATH) ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
FIND_PATH(PYTHON_INCLUDE_PATH FIND_PATH(PYTHON_INCLUDE_DIR
NAMES Python.h NAMES Python.h
PATHS PATHS
${PYTHON_FRAMEWORK_INCLUDES} ${PYTHON_FRAMEWORK_INCLUDES}
@ -50,22 +58,26 @@ FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
python${_CURRENT_VERSION} python${_CURRENT_VERSION}
) )
# For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal.
SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}" CACHE INTERNAL
"Path to where Python.h is found (deprecated)")
ENDFOREACH(_CURRENT_VERSION) ENDFOREACH(_CURRENT_VERSION)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
PYTHON_DEBUG_LIBRARY PYTHON_DEBUG_LIBRARY
PYTHON_LIBRARY PYTHON_LIBRARY
PYTHON_INCLUDE_PATH PYTHON_INCLUDE_DIR
) )
# Python Should be built and installed as a Framework on OSX # Python Should be built and installed as a Framework on OSX
IF(Python_FRAMEWORKS) IF(Python_FRAMEWORKS)
# If a framework has been selected for the include path, # If a framework has been selected for the include path,
# make sure "-framework" is used to link it. # make sure "-framework" is used to link it.
IF("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework") IF("${PYTHON_INCLUDE_DIR}" MATCHES "Python\\.framework")
SET(PYTHON_LIBRARY "") SET(PYTHON_LIBRARY "")
SET(PYTHON_DEBUG_LIBRARY "") SET(PYTHON_DEBUG_LIBRARY "")
ENDIF("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework") ENDIF("${PYTHON_INCLUDE_DIR}" MATCHES "Python\\.framework")
IF(NOT PYTHON_LIBRARY) IF(NOT PYTHON_LIBRARY)
SET (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE) SET (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
ENDIF(NOT PYTHON_LIBRARY) ENDIF(NOT PYTHON_LIBRARY)
@ -74,16 +86,17 @@ IF(Python_FRAMEWORKS)
ENDIF(NOT PYTHON_DEBUG_LIBRARY) ENDIF(NOT PYTHON_DEBUG_LIBRARY)
ENDIF(Python_FRAMEWORKS) ENDIF(Python_FRAMEWORKS)
# We use PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the cache entries # We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the
# because they are meant to specify the location of a single library. # cache entries because they are meant to specify the location of a single
# 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_LIBRARIES "${PYTHON_LIBRARY}") SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}") SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs DEFAULT_MSG PYTHON_LIBRARIES PYTHON_INCLUDE_PATH) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs DEFAULT_MSG PYTHON_LIBRARIES PYTHON_INCLUDE_DIRS)
# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python. # PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.