https://github.com/Kitware/CMake
Revision d9a6e0ffc82fbc460289c6b0808eff27ac316235 authored by Craig Scott on 10 September 2022, 08:22:18 UTC, committed by Craig Scott on 10 September 2022, 08:23:21 UTC
The unset() command was using __cmake_contentNameLower before that variable was restored from the __cmake_fcCurrentVarsStack. That means if there had been a nested call to FetchContent_MakeAvailable(), the wrong variable name would have been cleared (the nested name instead of the one from the current call). That would have left the variable set upon return, blocking the dependency provider from seeing any further calls to FetchContent_MakeAvailable() in the current variable scope or below for the current dependency.
1 parent a2f9e67
Tip revision: d9a6e0ffc82fbc460289c6b0808eff27ac316235 authored by Craig Scott on 10 September 2022, 08:22:18 UTC
FetchContent: Fix unsetting wrong variable name after provider returns
FetchContent: Fix unsetting wrong variable name after provider returns
Tip revision: d9a6e0f
| File | Mode | Size |
|---|---|---|
| CMakeLists.txt | -rw-r--r-- | 7.9 KB |
| ExePlugin.c | -rw-r--r-- | 360 bytes |
| UseSharedLibWithHelper.c | -rw-r--r-- | 313 bytes |
| a_always.c | -rw-r--r-- | 24 bytes |
| a_not_direct_from_A.c | -rw-r--r-- | 33 bytes |
| a_not_direct_from_A_for_exe.c | -rw-r--r-- | 41 bytes |
| a_not_direct_from_A_optional.c | -rw-r--r-- | 42 bytes |
| a_poison_direct_from_A.c | -rw-r--r-- | 95 bytes |
| a_poison_direct_from_A_for_exe.c | -rw-r--r-- | 119 bytes |
| a_poison_direct_from_A_optional.c | -rw-r--r-- | 122 bytes |
| direct_from_A.c | -rw-r--r-- | 29 bytes |
| direct_from_A_for_exe.c | -rw-r--r-- | 37 bytes |
| direct_from_A_for_exe_poison.c | -rw-r--r-- | 131 bytes |
| direct_from_A_optional.c | -rw-r--r-- | 38 bytes |
| direct_from_A_optional_poison.c | -rw-r--r-- | 134 bytes |
| direct_from_A_poison.c | -rw-r--r-- | 107 bytes |
| exe_use_static_A_private.c | -rw-r--r-- | 566 bytes |
| exe_use_static_A_public.c | -rw-r--r-- | 571 bytes |
| exe_use_static_A_public_explicit.c | -rw-r--r-- | 595 bytes |
| main.c | -rw-r--r-- | 89 bytes |
| order_A.c | -rw-r--r-- | 63 bytes |
| order_B.c | -rw-r--r-- | 63 bytes |
| order_B_poison.c | -rw-r--r-- | 78 bytes |
| order_C.c | -rw-r--r-- | 63 bytes |
| order_C_poison.c | -rw-r--r-- | 122 bytes |
| order_D.c | -rw-r--r-- | 63 bytes |
| order_D_poison.c | -rw-r--r-- | 166 bytes |
| order_E.c | -rw-r--r-- | 63 bytes |
| order_E_poison.c | -rw-r--r-- | 210 bytes |
| order_F.c | -rw-r--r-- | 63 bytes |
| order_F_poison.c | -rw-r--r-- | 254 bytes |
| order_G.c | -rw-r--r-- | 63 bytes |
| order_G_poison.c | -rw-r--r-- | 298 bytes |
| order_H.c | -rw-r--r-- | 63 bytes |
| order_H_poison.c | -rw-r--r-- | 342 bytes |
| order_I.c | -rw-r--r-- | 63 bytes |
| order_I_poison.c | -rw-r--r-- | 386 bytes |
| order_J.c | -rw-r--r-- | 23 bytes |
| order_J_poison.c | -rw-r--r-- | 430 bytes |
| order_main.c | -rw-r--r-- | 71 bytes |
| static_A_private.c | -rw-r--r-- | 363 bytes |
| static_A_public.c | -rw-r--r-- | 357 bytes |
| testExePluginHelperObj.c | -rw-r--r-- | 50 bytes |
| testExeWithPluginHelper.c | -rw-r--r-- | 121 bytes |
| testExeWithPluginHelper.cmake | -rw-r--r-- | 575 bytes |
| testSharedLibHelperObj.c | -rw-r--r-- | 50 bytes |
| testSharedLibWithHelper.c | -rw-r--r-- | 96 bytes |
| testSharedLibWithHelper.cmake | -rw-r--r-- | 508 bytes |
| testStaticLibPlugin.c | -rw-r--r-- | 186 bytes |
| testStaticLibPlugin.cmake | -rw-r--r-- | 1021 bytes |
| testStaticLibPluginExtra.c | -rw-r--r-- | 119 bytes |
| testStaticLibWithPlugin1.c | -rw-r--r-- | 51 bytes |
| testStaticLibWithPlugin2.c | -rw-r--r-- | 51 bytes |
| testStaticLibWithPluginBad1.c | -rw-r--r-- | 256 bytes |
| testStaticLibWithPluginBad2.c | -rw-r--r-- | 274 bytes |
Computing file changes ...
