diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-05-19 07:58:03 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-18 22:58:03 -0700 |
| commit | 69e86fd2013e0c495cc4e61500e794548b62ae03 (patch) | |
| tree | 622efdfd61d25e6105751e316b033e8ff4bcd804 /ports/flann/flann-linux.patch | |
| parent | 77af264118522788e24e463309220f97dcff0a79 (diff) | |
| download | vcpkg-69e86fd2013e0c495cc4e61500e794548b62ae03.tar.gz vcpkg-69e86fd2013e0c495cc4e61500e794548b62ae03.zip | |
[lz4, flann] port patches from #5169 (#6294)
* [lz4, flann] port patches from #5169
* [lz4] use vcpkg_fixup_cmake_targets
* [flann] improve target handling
* [lz4] remove unnecessary debug message
* [openmvg] many many fixes to build it on windows
* [pcl] use official FLANN cmake config file instead of custom module
* [pcl] fix patch for flann targets
* [pcl] Bump CONTROL version
Diffstat (limited to 'ports/flann/flann-linux.patch')
| -rw-r--r-- | ports/flann/flann-linux.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/ports/flann/flann-linux.patch b/ports/flann/flann-linux.patch deleted file mode 100644 index da95aa7a2..000000000 --- a/ports/flann/flann-linux.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/cpp/CMakeLists b/src/cpp/CMakeLists.txt -index e6c8ae06..c15a8e90 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -35,7 +35,7 @@ if (BUILD_CUDA_LIB) - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann_cpp SHARED "") -+ add_library(flann_cpp SHARED ${CPP_SOURCES}) - set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) - -@@ -90,7 +90,7 @@ if (BUILD_C_BINDINGS) - set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann SHARED "") -+ add_library(flann SHARED ${C_SOURCES}) - set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) - else() |