1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
diff -ura original/flann-1.9.1/src/cpp/CMakeLists.txt patched/flann-1.9.1/src/cpp/CMakeLists.txt
--- original/flann-1.9.1/src/cpp/CMakeLists.txt 2018-03-06 22:37:57.382075683 +0100
+++ patched/flann-1.9.1/src/cpp/CMakeLists.txt 2018-03-06 22:39:23.750880552 +0100
@@ -4,8 +4,8 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h)
-file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c)
-file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c)
+file(GLOB_RECURSE C_SOURCES flann.cpp)
+file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp)
file(GLOB_RECURSE CU_SOURCES *.cu)
add_library(flann_cpp_s STATIC ${CPP_SOURCES})
@@ -31,7 +31,12 @@
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
add_library(flann_cpp SHARED "")
set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+ target_link_libraries(flann_cpp
+ -Wl,-whole-archive
+ flann_cpp_s
+ -Wl,-no-whole-archive
+ lz4
+ )
if (BUILD_CUDA_LIB)
cuda_add_library(flann_cuda SHARED "")
@@ -85,7 +90,12 @@
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
add_library(flann SHARED "")
set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
+ target_link_libraries(flann
+ -Wl,-whole-archive
+ flann_s
+ -Wl,-no-whole-archive
+ lz4
+ )
else()
add_library(flann SHARED ${C_SOURCES})
@@ -112,7 +122,7 @@
install (
- TARGETS flann_cpp flann_cpp_s
+ TARGETS flann_cpp
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
@@ -129,7 +139,7 @@
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}
diff -ura original/flann-1.9.1/src/cpp/flann/util/serialization.h patched/flann-1.9.1/src/cpp/flann/util/serialization.h
--- original/flann-1.9.1/src/cpp/flann/util/serialization.h 2018-03-06 22:37:57.383075669 +0100
+++ patched/flann-1.9.1/src/cpp/flann/util/serialization.h 2018-03-06 22:38:52.811308429 +0100
@@ -6,8 +6,8 @@
#include <cstdlib>
#include <cstring>
#include <stdio.h>
-#include "flann/ext/lz4.h"
-#include "flann/ext/lz4hc.h"
+#include <lz4.h>
+#include <lz4hc.h>
namespace flann
|