From 7b0ca5d022785294448e86eb75af36387acdc49b Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 22 Oct 2018 03:51:28 -0700
Subject: [flann] Fix parallel configure

---
 ports/flann/CONTROL                |  2 +-
 ports/flann/no-write-src-dir.patch | 19 +++++++++++++++++++
 ports/flann/portfile.cmake         | 11 ++++-------
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 ports/flann/no-write-src-dir.patch

diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL
index 850c76850..4ec6072ab 100644
--- a/ports/flann/CONTROL
+++ b/ports/flann/CONTROL
@@ -1,3 +1,3 @@
 Source: flann
-Version: 1.9.1-7
+Version: 1.9.1-8
 Description: Fast Library for Approximate Nearest Neighbors
diff --git a/ports/flann/no-write-src-dir.patch b/ports/flann/no-write-src-dir.patch
new file mode 100644
index 000000000..c44c869cc
--- /dev/null
+++ b/ports/flann/no-write-src-dir.patch
@@ -0,0 +1,19 @@
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index eb84c8a..e6c8ae0 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -2,7 +2,13 @@
+ 
+ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h)
++include_directories(${CMAKE_CURRENT_BINARY_DIR}/flann)
++
++install (
++    FILES ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h
++    DESTINATION include/flann
++)
+ 
+ file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c)
+ file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c)
diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake
index e40e45b68..2d6c40486 100644
--- a/ports/flann/portfile.cmake
+++ b/ports/flann/portfile.cmake
@@ -6,14 +6,11 @@ vcpkg_from_github(
     REF  1.9.1
     SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-install-flann.patch
-        ${CMAKE_CURRENT_LIST_DIR}/Revert-fix-install-flann.patch
-        ${CMAKE_CURRENT_LIST_DIR}/export-all-symbols-of-flann-cpp.patch
+        fix-install-flann.patch
+        Revert-fix-install-flann.patch
+        export-all-symbols-of-flann-cpp.patch
+        no-write-src-dir.patch
 )
 
 vcpkg_configure_cmake(
-- 
cgit v1.2.3