diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-13 12:42:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-13 12:42:48 (GMT) |
| commit | 165208c784a0f0a420ebced5ab4b251505743e22 (patch) | |
| tree | 113bf470e2bf2668344c4b2c0f9284795c2eda54 /Modules | |
| parent | a0a116693547460fc5edceac1be44533ccd9a407 (diff) | |
| parent | 11c8da94d4d688f707d21923fa6a9cdbe229d807 (diff) | |
| download | CMake-165208c784a0f0a420ebced5ab4b251505743e22.zip CMake-165208c784a0f0a420ebced5ab4b251505743e22.tar.gz CMake-165208c784a0f0a420ebced5ab4b251505743e22.tar.bz2 | |
Merge topic 'FindPkgConfig-LIBRARY_PATH' into release-3.23
11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7258
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 547bc52..ab8af3e 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -429,7 +429,7 @@ macro(_pkg_set_path_internal) else() unset(_pkgconfig_allow_system_libs_old) endif() - set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} 0) + set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} 1) endmacro() macro(_pkg_restore_path_internal) @@ -440,6 +440,8 @@ macro(_pkg_restore_path_internal) if(DEFINED _pkgconfig_allow_system_libs_old) set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} "${_pkgconfig_allow_system_libs_old}") unset(_pkgconfig_allow_system_libs_old) + else() + unset(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}) endif() unset(_extra_paths) |