diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-19 14:27:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-19 14:27:23 (GMT) |
| commit | 30dd9b33a048ec76fd48665f3793cf282cd75f12 (patch) | |
| tree | dbf4fc68b294f6ef3cdb7787be5352a565633400 /Modules | |
| parent | daeb4f0f5070d70e0bae9e966099f64b4c4671e9 (diff) | |
| parent | 17e4934dbfa6df048e201bf0f0b46ad8d0e279ef (diff) | |
| download | CMake-30dd9b33a048ec76fd48665f3793cf282cd75f12.zip CMake-30dd9b33a048ec76fd48665f3793cf282cd75f12.tar.gz CMake-30dd9b33a048ec76fd48665f3793cf282cd75f12.tar.bz2 | |
Merge topic 'FindPkgConfig-restore-legacy-behavior' into release-3.21
17e4934dbf FindPkgConfig: Restore legacy behavior when CMP0126 is set to NEW
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6461
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 3bc9dba..01ad5ac 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -79,10 +79,18 @@ set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}") # Unsets the given variables macro(_pkgconfig_unset var) + # Clear normal variable (possibly set by project code). + unset(${var}) + # Store as cache variable. + # FIXME: Add a policy to switch to a normal variable. set(${var} "" CACHE INTERNAL "") endmacro() macro(_pkgconfig_set var value) + # Clear normal variable (possibly set by project code). + unset(${var}) + # Store as cache variable. + # FIXME: Add a policy to switch to a normal variable. set(${var} ${value} CACHE INTERNAL "") endmacro() |