summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-03-16 10:54:48 -0400
committerBrad King <brad.king@kitware.com>2021-03-16 10:54:48 -0400
commit5aa01927c0d003d0b7430504f253fa4758c0263a (patch)
tree7bb6da2584929eccdcb138d014f45da6f4d3d552
parent22612dd53a46c7f9b4c3f4b7dbe5c78f9afd9581 (diff)
parentc7bd2d0d974a2246641c5523ee95beb6e06d6762 (diff)
downloadcmake-5aa01927c0d003d0b7430504f253fa4758c0263a.tar.gz
Merge branch 'FindPkgConfig-NAMES_PER_DIR' into release-3.19
Merge-request: !5914
-rw-r--r--Modules/FindPkgConfig.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 2ad2c7e174..360f439238 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 "")