mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindPython*: fix erroneous behavior on multiple 'find_package' calls

Browse Source 
Fixes: #18192
This commit is contained in:
Marc Chevrier
2018-07-21 11:53:03 +02:00
committed by Brad King
parent f84c15ef2f
commit 50921cc04e
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindPython/Support.cmake
View File

@@ -196,10 +196,6 @@ endif()
set (CMAKE_FIND_FRAMEWORK LAST)
unset (${_PYTHON_PREFIX}_VERSION_MAJOR)
unset (${_PYTHON_PREFIX}_VERSION_MINOR)
unset (${_PYTHON_PREFIX}_VERSION_PATCH)
unset (_${_PYTHON_PREFIX}_REQUIRED_VARS)
unset (_${_PYTHON_PREFIX}_CACHED_VARS)
@@ -259,7 +255,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
# try more generic names
if (NOT ${_PYTHON_PREFIX}_EXECUTABLE)
find_program (${_PYTHON_PREFIX}_EXECUTABLE
NAMES python${${_PYTHON_PREFIX}_VERSION_MAJOR} python
NAMES python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR} python
${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
HINTS ${_${_PYTHON_PREFIX}_HINTS}
PATH_SUFFIXES bin)