diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-13 12:12:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-13 12:12:36 (GMT) |
| commit | 96011ab06d8839010c181d501c58c8e914f3ba91 (patch) | |
| tree | 85a0eccf713c6247cd76d3941b93db7fac9c8d64 /Source/cmMakefile.cxx | |
| parent | 3a254019ca1c855ca2c211fef888e2fc4f9ce4c3 (diff) | |
| parent | 08db1341a60035b303a20eb3f23126a661323c27 (diff) | |
| download | CMake-96011ab06d8839010c181d501c58c8e914f3ba91.zip CMake-96011ab06d8839010c181d501c58c8e914f3ba91.tar.gz CMake-96011ab06d8839010c181d501c58c8e914f3ba91.tar.bz2 | |
Merge topic 'find_item-consistent-behavior-cache-variables'
08db1341a6 find_*: ensure consistent behavior for cache variables
f5fa6d53b0 class cmake: Store working directory at cmake launch
b1729200c3 find_*: refactor cache variable handling
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6110
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 29f9e36..4ffd47b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1963,6 +1963,8 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value, } this->GetCMakeInstance()->AddCacheEntry(name, value, doc, type); // if there was a definition then remove it + // The method cmFindBase::NormalizeFindResult also apply same workflow. + // See #22038 for problems raised by this behavior. this->StateSnapshot.RemoveDefinition(name); } |