3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 14:37:55 +08:00
Code Issues Projects Releases Wiki Activity

[flann] Fix parallel configure

Browse Source
This commit is contained in:
Robert Schumacher 2018-10-22 03:51:28 -07:00
parent 9cb0f3c8ae
commit 7b0ca5d022
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/flann/CONTROL
View File

@ -1,3 +1,3 @@
Source: flann
Version: 1.9.1-7
Version: 1.9.1-8
Description: Fast Library for Approximate Nearest Neighbors

19
ports/flann/no-write-src-dir.patch Normal file
View File

@ -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)

11
ports/flann/portfile.cmake
View File

@ -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(