diff options
| author | mmazaherit <m.mazaheri.t@gmail.com> | 2017-06-11 17:26:22 -0400 |
|---|---|---|
| committer | mmazaherit <m.mazaheri.t@gmail.com> | 2017-06-11 17:26:22 -0400 |
| commit | ec625bc160748ea4b35c3c0c4fb7daa06b42de32 (patch) | |
| tree | bfc208f7c756aad29900cde894e6ca1712c44dea /ports/flann/fix-install-flann.patch | |
| parent | c4de5e29b11bd5815b479aa94172a227c3cac55a (diff) | |
| download | vcpkg-ec625bc160748ea4b35c3c0c4fb7daa06b42de32.tar.gz vcpkg-ec625bc160748ea4b35c3c0c4fb7daa06b42de32.zip | |
check in flann
Diffstat (limited to 'ports/flann/fix-install-flann.patch')
| -rw-r--r-- | ports/flann/fix-install-flann.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/ports/flann/fix-install-flann.patch b/ports/flann/fix-install-flann.patch new file mode 100644 index 000000000..f65094e8f --- /dev/null +++ b/ports/flann/fix-install-flann.patch @@ -0,0 +1,41 @@ +diff --git "a/src/cpp/CMakeLists.txt" "b/src/cpp/CMakeLists.txt" +index 49c53f0..cc58c90 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 SHARED ${C_SOURCES}) ++ add_library(flann ${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 flann_s ++ TARGETS flann + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} |