diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-19 14:35:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-19 14:35:43 (GMT) |
| commit | f8f531584716e732a8f0da44e285e996cb172574 (patch) | |
| tree | f7c5a3840e4df2273b962ac4c6495eb6638cb3d7 | |
| parent | 65146afc4e6b7fd9394e475e7d5e5ef9d0f10401 (diff) | |
| parent | 8979a1070097fde3ca0ab45bdd6580b7acd07ca4 (diff) | |
| download | CMake-f8f531584716e732a8f0da44e285e996cb172574.zip CMake-f8f531584716e732a8f0da44e285e996cb172574.tar.gz CMake-f8f531584716e732a8f0da44e285e996cb172574.tar.bz2 | |
Merge topic 'FindPkgConfig-fix-restore'
8979a107 FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index eba6953..f24d2da 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -401,7 +401,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma if(NOT "${_extra_paths}" STREQUAL "") # Restore the environment variable - set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path}) + set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path_old}) endif() unset(_extra_paths) |