diff options
| author | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:31:23 +0100 |
|---|---|---|
| committer | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:31:23 +0100 |
| commit | 7419fc975ce8447b7faf058e218ff6dd84db992d (patch) | |
| tree | e5a57da5337296e316c23461bd22a38282bbcfcb /ports/flann/Revert-fix-install-flann.patch | |
| parent | 0e898fe892a054eac39aec1fae911e6235fbddfa (diff) | |
| download | vcpkg-7419fc975ce8447b7faf058e218ff6dd84db992d.tar.gz vcpkg-7419fc975ce8447b7faf058e218ff6dd84db992d.zip | |
fixed flann for linux
Diffstat (limited to 'ports/flann/Revert-fix-install-flann.patch')
| -rw-r--r-- | ports/flann/Revert-fix-install-flann.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/ports/flann/Revert-fix-install-flann.patch b/ports/flann/Revert-fix-install-flann.patch deleted file mode 100644 index ace1b592a..000000000 --- a/ports/flann/Revert-fix-install-flann.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index cc58c90..49c53f0 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -87,7 +87,7 @@ if (BUILD_C_BINDINGS) - set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) - else() -- add_library(flann ${C_SOURCES}) -+ add_library(flann SHARED ${C_SOURCES}) - - if(MINGW AND OPENMP_FOUND) - target_link_libraries(flann gomp) -@@ -111,12 +111,12 @@ endif() - endif(WIN32) - - --#install ( --# TARGETS flann_cpp flann_cpp_s --# RUNTIME DESTINATION bin --# LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} --# ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} --#) -+install ( -+ TARGETS flann_cpp flann_cpp_s -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} -+ ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} -+) - - if (BUILD_CUDA_LIB) - install ( -@@ -129,7 +129,7 @@ endif() - - if (BUILD_C_BINDINGS) - install ( -- TARGETS flann -+ TARGETS flann flann_s - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} |