From 50921cc04e1ae761a188d4df0cc3025719ace11c Mon Sep 17 00:00:00 2001 From: Marc Chevrier Date: Sat, 21 Jul 2018 11:53:03 +0200 Subject: FindPython*: fix erroneous behavior on multiple 'find_package' calls Fixes: #18192 --- Modules/FindPython/Support.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 08f07fd..fe3df91 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -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) -- cgit v0.12