diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
| commit | 7347305e8459fcc78553a9f88196e0d93eb0a8fe (patch) | |
| tree | ac9eee9ff267c6a71a83249bed7a94f02b00d9a5 /ports/flann/no-write-src-dir.patch | |
| parent | ed9357a5aafea7192932b5874264bd103fc61255 (diff) | |
| parent | 63c1b2628e958f8e02356411f032941c0c2f3bbb (diff) | |
| download | vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.tar.gz vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425
Diffstat (limited to 'ports/flann/no-write-src-dir.patch')
| -rw-r--r-- | ports/flann/no-write-src-dir.patch | 19 |
1 files changed, 19 insertions, 0 deletions
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)
|