Commit 206f12ac authored by David Gobbi's avatar David Gobbi Committed by Kitware Robot

Merge topic 'python-py3k'

79ed9c29 Help FindPythonLibs.cmake find Py3k on OS X.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !658
parents 86b6ca6e 79ed9c29
......@@ -42,10 +42,16 @@ endif()
# the user supplied additional versions to the front.
set(_Python_VERSIONS
${Python_ADDITIONAL_VERSIONS} ${_PythonInterp_VERSION}
2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
2.7 2.6 2.5 3.6 3.5 3.4 3.3 3.2)
FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
set(_FRAMEWORK_LIB_DIRS)
foreach(dir ${Python_FRAMEWORKS})
list(APPEND _FRAMEWORK_LIB_DIRS ${dir}/Versions/${_CURRENT_VERSION}/lib)
endforeach()
IF(WIN32)
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
......@@ -57,6 +63,7 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
FIND_LIBRARY(PYTHON_LIBRARY
NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
PATHS
${_FRAMEWORK_LIB_DIRS}
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
# Avoid finding the .dll in the PATH. We want the .lib.
NO_SYSTEM_ENVIRONMENT_PATH
......@@ -76,8 +83,9 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
SET(PYTHON_FRAMEWORK_INCLUDES)
IF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
FOREACH(dir ${Python_FRAMEWORKS})
SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION})
LIST(APPEND PYTHON_FRAMEWORK_INCLUDES
${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION}
${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION}m)
ENDFOREACH()
ENDIF()
......
......@@ -452,7 +452,7 @@ include(VTKParallelCMakeTests)
# Add the option for build the Python wrapping to VTK.
option(VTK_WRAP_PYTHON "Should VTK Python wrapping be built?" OFF)
set(VTK_PYTHON_VERSION 2 CACHE STRING
"Python version to use: 2, 2.x, or empty")
"Python version to use: 2, 2.x, 3, 3.x, or empty")
# Add the option for build the Python wrapping to VTK.
option(VTK_WRAP_JAVA "Should VTK Java wrapping be built?" OFF)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment