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 | 87c6fe4997bb42cd84914206946be5572b040747 (patch) | |
| tree | 9f3162d4d7a6ee771e63dc7cc17875d00efbde69 /Modules | |
| parent | 0f63a64b61bcaaa29b710d5fc5b8855d4c2cd492 (diff) | |
| parent | c7bd2d0d974a2246641c5523ee95beb6e06d6762 (diff) | |
| download | CMake-87c6fe4997bb42cd84914206946be5572b040747.zip CMake-87c6fe4997bb42cd84914206946be5572b040747.tar.gz CMake-87c6fe4997bb42cd84914206946be5572b040747.tar.bz2 | |
Merge topic 'FindPkgConfig-NAMES_PER_DIR'
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 "") |