summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2020-02-26 11:05:18 (GMT)
committerBrad King <brad.king@kitware.com>2020-02-26 13:08:26 (GMT)
commit42c6a1bfee3c8662bf90b0474752902707591c32 (patch)
tree48cf82386e31dbb5f8405e77420d1d7d3c21c0a0 /Modules
parenta7b4516e1aaf89ad7a6d25c6bdee743bfc175b54 (diff)
downloadCMake-42c6a1bfee3c8662bf90b0474752902707591c32.zip
CMake-42c6a1bfee3c8662bf90b0474752902707591c32.tar.gz
CMake-42c6a1bfee3c8662bf90b0474752902707591c32.tar.bz2
FindPython: Do not cache computed result variables
Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the cache. They are always computed from other results and so should not be presented to users in cmake-gui and ccmake to edit. Issue: #20362
Diffstat (limited to 'Modules')
-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 0d03233..0f52008 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -2078,7 +2078,7 @@ if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
# finalize library version information
_python_get_version (LIBRARY PREFIX _${_PYTHON_PREFIX}_)
- set (${_PYTHON_PREFIX}_LIBRARY_RELEASE "${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}" CACHE FILEPATH "Path to a library." FORCE)
+ set (${_PYTHON_PREFIX}_LIBRARY_RELEASE "${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}")
if (_${_PYTHON_PREFIX}_LIBRARY_RELEASE AND NOT EXISTS "${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}")
set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Cannot find the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
@@ -2237,7 +2237,7 @@ if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
endif()
# define public variables
- set (${_PYTHON_PREFIX}_LIBRARY_DEBUG "${_${_PYTHON_PREFIX}_LIBRARY_DEBUG}" CACHE FILEPATH "Path to a library." FORCE)
+ set (${_PYTHON_PREFIX}_LIBRARY_DEBUG "${_${_PYTHON_PREFIX}_LIBRARY_DEBUG}")
_python_select_library_configurations (${_PYTHON_PREFIX})
set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE "${_${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE}")