d409857781
The patch series was recreated by applying it to a CMake git checkout at v3.10.1, and then rebasing it onto v3.11.0, followed by patch resync with CMake 3.11.1 Patch 0004-Implement-Qt5-static-plugin-support.patch had to be extensively redone, to support a refactoring in the Qt5 auto-gen support in CMake 3.11.0. The rest of the patches are changed only due to artifacts of this rebasing.
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 04954fa9efc95810ed55d4ac1f6737161a938179 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 952ca9265..f77c9b6d8 100644
|
|
--- a/Modules/FindPkgConfig.cmake
|
|
+++ b/Modules/FindPkgConfig.cmake
|
|
@@ -58,8 +58,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.16.2.windows.1
|
|
|