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
|
diff --git a/src/aliceVision/feature/CMakeLists.txt b/src/aliceVision/feature/CMakeLists.txt
index a3a6e8a..9179f0c 100644
--- a/src/aliceVision/feature/CMakeLists.txt
+++ b/src/aliceVision/feature/CMakeLists.txt
@@ -74,13 +74,13 @@ alicevision_add_library(aliceVision_feature
SOURCES ${features_files_headers} ${features_files_sources}
PUBLIC_LINKS
aliceVision_image
aliceVision_numeric
aliceVision_system
aliceVision_gpu
- vlsift
+ aliceVision_vlsift
PRIVATE_LINKS
Boost::boost
)
# Link CCTAG library
if (ALICEVISION_HAVE_CCTAG)
diff --git a/src/nonFree/sift/CMakeLists.txt b/src/nonFree/sift/CMakeLists.txt
index c3b066f..d165b71 100644
--- a/src/nonFree/sift/CMakeLists.txt
+++ b/src/nonFree/sift/CMakeLists.txt
@@ -46,22 +46,22 @@ set_source_files_properties(${FEATS_H} PROPERTIES HEADER_FILE_ONLY TRUE)
set(SIMD_DEFINITIONS "-DVL_DISABLE_AVX")
if (NOT ALICEVISION_HAVE_SSE)
list(APPEND SIMD_DEFINITIONS "-DVL_DISABLE_SSE2")
endif()
-alicevision_add_library(vlsift
+alicevision_add_library(aliceVision_vlsift
SOURCES
${FEATS} ${FEATS_H}
PUBLIC_DEFINITIONS
${SIMD_DEFINITIONS}
PRIVATE_DEFINITIONS
-DVL_BUILD_DLL
)
-set_property(TARGET vlsift
+set_property(TARGET aliceVision_vlsift
PROPERTY FOLDER nonFree
)
install(
DIRECTORY .
DESTINATION include/aliceVision_dependencies/nonFree/sift
diff --git a/src/software/pipeline/CMakeLists.txt b/src/software/pipeline/CMakeLists.txt
index c959743..6f93de9 100644
--- a/src/software/pipeline/CMakeLists.txt
+++ b/src/software/pipeline/CMakeLists.txt
@@ -49,13 +49,13 @@ if (ALICEVISION_BUILD_SFM)
aliceVision_image
aliceVision_feature
aliceVision_featureEngine
aliceVision_multiview
aliceVision_sfmData
aliceVision_sfmDataIO
- vlsift
+ aliceVision_vlsift
Boost::program_options
Boost::boost
Boost::timer
)
# Image matching
|
