From 02dd1ccd62acd15747f7a6a376cecde782f0fdda Mon Sep 17 00:00:00 2001
From: hannamagdalena <37101037+hannamagdalena@users.noreply.github.com>
Date: Thu, 3 Oct 2019 09:08:59 +0200
Subject: [PATCH] [thrift]fix-paths (#8410)

* Fix false generated paths

* Change thrift version number
---
 ports/thrift/CONTROL             |  2 +-
 ports/thrift/correct-paths.patch | 15 +++++++++++++++
 ports/thrift/portfile.cmake      |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 ports/thrift/correct-paths.patch

diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
index cfff0ac7e..9f54385cb 100644
--- a/ports/thrift/CONTROL
+++ b/ports/thrift/CONTROL
@@ -1,5 +1,5 @@
 Source: thrift
-Version: 2019-05-07-3
+Version: 2019-05-07-4
 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
 Homepage: https://github.com/apache/thrift
 Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.
diff --git a/ports/thrift/correct-paths.patch b/ports/thrift/correct-paths.patch
new file mode 100644
index 000000000..26c21dd02
--- /dev/null
+++ b/ports/thrift/correct-paths.patch
@@ -0,0 +1,15 @@
+diff --git a/build/cmake/GenerateConfigModule.cmake b/build/cmake/GenerateConfigModule.cmake
+index 9533c82..d074a1b 100644
+--- a/build/cmake/GenerateConfigModule.cmake
++++ b/build/cmake/GenerateConfigModule.cmake
+@@ -19,8 +19,8 @@
+ 
+ include(CMakePackageConfigHelpers)
+ set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}/thrift")
+-set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}/thrift")
+-set(PACKAGE_BIN_INSTALL_DIR "${exec_prefix}")
++set(PACKAGE_CMAKE_INSTALL_DIR "${prefix}/share/thrift")
++set(PACKAGE_BIN_INSTALL_DIR "${prefix}/tools/thrift")
+ 
+ # In CYGWIN enviroment below commands does not work properly
+ if (NOT CYGWIN)
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index 5c5a76e9f..12e92a66b 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -16,6 +16,8 @@ vcpkg_from_github(
     REF acdd4226c210336e9e15eb812e5932a645fcd5ce
     SHA512 53986b1cde7b2bd19974f32b8c31736566061a228dda368d3d850355c566d910499c16519bbff078a6cdab19931cd9833a7d684ac63fb1ec40b2a123ff263aaa
     HEAD_REF master
+    PATCHES
+      "correct-paths.patch"
 )
 
 # note we specify values for WITH_STATIC_LIB and WITH_SHARED_LIB because even though