From 8b46548826864d5ab96264a127becc6a01f13cf5 Mon Sep 17 00:00:00 2001
From: Phil Christensen <philc@microsoft.com>
Date: Fri, 30 Nov 2018 16:01:31 -0800
Subject: [PATCH] patch missing @ in cmake config

---
 ports/gflags/CONTROL                |  2 +-
 ports/gflags/fix_cmake_config.patch | 13 +++++++++++++
 ports/gflags/portfile.cmake         |  7 ++-----
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 ports/gflags/fix_cmake_config.patch

diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL
index bf0800eec0..b090f2ba51 100644
--- a/ports/gflags/CONTROL
+++ b/ports/gflags/CONTROL
@@ -1,3 +1,3 @@
 Source: gflags
-Version: 2.2.2
+Version: 2.2.2-1
 Description: A C++ library that implements commandline flags processing
diff --git a/ports/gflags/fix_cmake_config.patch b/ports/gflags/fix_cmake_config.patch
new file mode 100644
index 0000000000..bea561ecba
--- /dev/null
+++ b/ports/gflags/fix_cmake_config.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
+index a512c2a..e7f50d0 100644
+--- a/cmake/config.cmake.in
++++ b/cmake/config.cmake.in
+@@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS)
+     else ()
+       set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
+     endif ()
+-  elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
++  elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
+     set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
+   else ()
+     set (@PACKAGE_PREFIX@_NOTHREADS TRUE)
diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake
index 11ef0cd935..87053f8499 100644
--- a/ports/gflags/portfile.cmake
+++ b/ports/gflags/portfile.cmake
@@ -10,12 +10,9 @@ vcpkg_from_github(
     REF v2.2.2
     SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
+        0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
+        fix_cmake_config.patch
 )
 
 vcpkg_configure_cmake(