summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDaniele E. Domenichelli <daniele.domenichelli@iit.it>2015-05-29 16:50:59 (GMT)
committerDaniele E. Domenichelli <daniele.domenichelli@iit.it>2015-05-29 17:22:57 (GMT)
commitd4c6531a945564d230200512c680ca8570b10a6c (patch)
treeeab48d50c247b06273edea41453c8c99dc93076b /Modules
parentec12336f15c0fb0181274ac0fe972898e24fb018 (diff)
downloadCMake-d4c6531a945564d230200512c680ca8570b10a6c.zip
CMake-d4c6531a945564d230200512c680ca8570b10a6c.tar.gz
CMake-d4c6531a945564d230200512c680ca8570b10a6c.tar.bz2
FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
The CMAKE_FRAMEWORK_PATH and CMAKE_APPBUNDLE_PATH cache variables are supposed to be used to generate the extra paths passed to pkg-config, but instead the CMAKE_PREFIX_PATH variable is used. This bug was introduced by the refactor in commit v3.1.0-rc1~747^2~1.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindPkgConfig.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 64ccde5..53c17f1 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -149,7 +149,7 @@ function(_pkgconfig_add_extra_path _extra_paths_var _var)
endif()
if(NOT _is_env)
if(NOT "${${_var}}" STREQUAL "")
- list(APPEND ${_extra_paths_var} ${CMAKE_PREFIX_PATH})
+ list(APPEND ${_extra_paths_var} ${${_var}})
endif()
else()
if(NOT "$ENV{${_var}}" STREQUAL "")