diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-17 13:38:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-17 13:38:47 (GMT) |
| commit | d6acaa7bbd39fde96dd0cb54dcebbb318e5ccd23 (patch) | |
| tree | 2f69c1246f104186514a209e09468453e106e0d1 /Modules | |
| parent | ec9a2db02c0ac4644b00a40930f8060c05dfb64a (diff) | |
| parent | c7bd2d0d974a2246641c5523ee95beb6e06d6762 (diff) | |
| download | CMake-d6acaa7bbd39fde96dd0cb54dcebbb318e5ccd23.zip CMake-d6acaa7bbd39fde96dd0cb54dcebbb318e5ccd23.tar.gz CMake-d6acaa7bbd39fde96dd0cb54dcebbb318e5ccd23.tar.bz2 | |
Merge topic 'FindPkgConfig-NAMES_PER_DIR' into release-3.20
c7bd2d0d97 FindPkgConfig: Restore preference for first pkg-config in PATH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5914
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index b41c2c3..38c8da7 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -37,7 +37,10 @@ if(CMAKE_HOST_WIN32) list(PREPEND PKG_CONFIG_NAMES "pkg-config.bat") endif() -find_program(PKG_CONFIG_EXECUTABLE NAMES ${PKG_CONFIG_NAMES} DOC "pkg-config executable") +find_program(PKG_CONFIG_EXECUTABLE + NAMES ${PKG_CONFIG_NAMES} + NAMES_PER_DIR + DOC "pkg-config executable") mark_as_advanced(PKG_CONFIG_EXECUTABLE) set(_PKG_CONFIG_FAILURE_MESSAGE "") |