33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 9e5de9d1f1d28cade629e602b7c236eebdeea97d Mon Sep 17 00:00:00 2001
|
|
From: Ray Donnelly <mingw.android@gmail.com>
|
|
Date: Tue, 14 Feb 2017 09:34:39 -0600
|
|
Subject: [PATCH 6/8] pkg-config: Add --dont-define-prefix when
|
|
PKG_CONFIG_WITHOUT_PREFIX
|
|
|
|
---
|
|
Modules/FindPkgConfig.cmake | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
|
|
index 1958f4b434..c590bfa6e5 100644
|
|
--- a/Modules/FindPkgConfig.cmake
|
|
+++ b/Modules/FindPkgConfig.cmake
|
|
@@ -55,8 +55,13 @@ endmacro()
|
|
macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
|
|
set(_pkgconfig_invoke_result)
|
|
|
|
+ if (PKG_CONFIG_WITHOUT_PREFIX)
|
|
+ set(_pkgconfig_extra_arg "--dont-define-prefix")
|
|
+ else()
|
|
+ set(_pkgconfig_extra_arg "")
|
|
+ endif()
|
|
execute_process(
|
|
- COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
|
|
+ COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkgconfig_extra_arg} ${ARGN} ${_pkglist}
|
|
OUTPUT_VARIABLE _pkgconfig_invoke_result
|
|
RESULT_VARIABLE _pkgconfig_failed
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
--
|
|
2.11.0
|
|
|