diff options
| author | Craig Scott <craig.scott@crascit.com> | 2022-09-11 22:08:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-11 22:09:09 (GMT) |
| commit | 31e832133ae6af0872854bdb2765fab93919139b (patch) | |
| tree | 65da7af4487afa648f674f2183c32978bd495600 | |
| parent | a2f9e674bb15d91af15cec815a5c40c0ecc2ee9f (diff) | |
| parent | d9a6e0ffc82fbc460289c6b0808eff27ac316235 (diff) | |
| download | CMake-31e832133ae6af0872854bdb2765fab93919139b.zip CMake-31e832133ae6af0872854bdb2765fab93919139b.tar.gz CMake-31e832133ae6af0872854bdb2765fab93919139b.tar.bz2 | |
Merge topic 'fetchcontent-unset-wrong-nested-var' into release-3.24
d9a6e0ffc8 FetchContent: Fix unsetting wrong variable name after provider returns
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7663
| -rw-r--r-- | Modules/FetchContent.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake index 20f0bd2..bb7e44d 100644 --- a/Modules/FetchContent.cmake +++ b/Modules/FetchContent.cmake @@ -1893,13 +1893,13 @@ macro(FetchContent_MakeAvailable) set(__cmake_fcProvider_${__cmake_contentNameLower} YES) cmake_language(EVAL CODE "${__cmake_providerCommand}(${__cmake_providerArgs})") - unset(__cmake_fcProvider_${__cmake_contentNameLower}) list(POP_BACK __cmake_fcCurrentVarsStack __cmake_contentNameLower __cmake_contentName ) + unset(__cmake_fcProvider_${__cmake_contentNameLower}) unset(__cmake_providerArgs) unset(__cmake_addfpargs) unset(__cmake_fpargs) |