summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-02-16 17:06:58 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-02-16 17:07:17 (GMT)
commit67079c2a890d29492a07bdad2dfb494be7146628 (patch)
treeea7cb76024dc7c16ec1da610606373ad7e0140a8
parent8289dd75ade017bddbbab77c5a4987b79c8710f4 (diff)
parent754f4f6876f05b213b5ad2fc1a2e581bf529beb6 (diff)
downloadCMake-67079c2a890d29492a07bdad2dfb494be7146628.zip
CMake-67079c2a890d29492a07bdad2dfb494be7146628.tar.gz
CMake-67079c2a890d29492a07bdad2dfb494be7146628.tar.bz2
Merge topic 'FindPython-fix-variable-handling' into release-3.20
754f4f6876 FindPython: fix erroneous variable handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5816
-rw-r--r--Modules/FindPython/Support.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 0c775f7..8e70e11 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -1544,7 +1544,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
if (${_PYTHON_PREFIX}_FIND_VERSION_RANGE)
list (APPEND _${_PYTHON_PREFIX}_VALIDATE_OPTIONS IN_RANGE)
elseif (DEFINED ${_PYTHON_PREFIX}_FIND_VERSION)
- list (APPEND VERSION ${${_PYTHON_PREFIX}_FIND_VERSION})
+ list (APPEND _${_PYTHON_PREFIX}_VALIDATE_OPTIONS VERSION ${${_PYTHON_PREFIX}_FIND_VERSION})
endif()
while (TRUE)
@@ -2012,7 +2012,7 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
if (${_PYTHON_PREFIX}_FIND_VERSION_RANGE)
list (APPEND _${_PYTHON_PREFIX}_VALIDATE_OPTIONS IN_RANGE)
elseif (DEFINED ${_PYTHON_PREFIX}_FIND_VERSION)
- list (APPEND VERSION ${${_PYTHON_PREFIX}_FIND_VERSION})
+ list (APPEND _${_PYTHON_PREFIX}_VALIDATE_OPTIONS VERSION ${${_PYTHON_PREFIX}_FIND_VERSION})
endif()
while (TRUE)