Skip to content

Commit 55c365f

Browse files
committed
[src] CMake: Switch LEMON linking to imported target
1 parent 2cb1a39 commit 55c365f

6 files changed

Lines changed: 24 additions & 12 deletions

File tree

src/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,6 @@ set(ALICEVISION_INCLUDE_DIRS
912912
${CMAKE_CURRENT_SOURCE_DIR}
913913
${generatedDir}
914914
${CMAKE_CURRENT_SOURCE_DIR}/dependencies
915-
${LEMON_INCLUDE_DIRS}
916915
${EIGEN3_INCLUDE_DIRS}
917916
${CERES_INCLUDE_DIRS}
918917
${UNCERTAINTYTE_INCLUDE_DIRS}

src/aliceVision/graph/CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,18 @@ alicevision_add_interface(aliceVision_graph
1414
)
1515

1616
# Unit tests
17-
alicevision_add_test(connectedComponent_test.cpp NAME "graph_connectedComponent" LINKS aliceVision_graph ${LEMON_LIBRARY})
18-
alicevision_add_test(triplet_test.cpp NAME "graph_triplet" LINKS aliceVision_graph ${LEMON_LIBRARY})
17+
alicevision_add_test(connectedComponent_test.cpp
18+
NAME
19+
"graph_connectedComponent"
20+
LINKS
21+
aliceVision_graph
22+
LEMON::lemon
23+
)
24+
25+
alicevision_add_test(triplet_test.cpp
26+
NAME
27+
"graph_triplet"
28+
LINKS
29+
aliceVision_graph
30+
LEMON::lemon
31+
)

src/aliceVision/multiview/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ alicevision_add_library(aliceVision_multiview
8080
aliceVision_robustEstimation
8181
aliceVision_camera
8282
${CERES_LIBRARIES}
83+
LEMON::lemon
8384
PRIVATE_LINKS
8485
aliceVision_system
85-
${LEMON_LIBRARY}
8686
)
8787

8888
alicevision_add_library(aliceVision_multiview_test_data

src/aliceVision/sfm/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ alicevision_add_library(aliceVision_sfm_bundle
117117
aliceVision_sfmData
118118
Boost::boost
119119
${CERES_LIBRARIES}
120+
LEMON::lemon
120121
)
121122

122123
alicevision_add_library(aliceVision_sfm
@@ -138,8 +139,8 @@ alicevision_add_library(aliceVision_sfm
138139
aliceVision_sfm_bundle
139140
aliceVision_dataio
140141
Boost::boost
142+
LEMON::lemon
141143
PRIVATE_LINKS
142-
${LEMON_LIBRARY}
143144
nanoflann::nanoflann
144145
)
145146

@@ -152,7 +153,7 @@ alicevision_add_test(bundle/bundleAdjustment_test.cpp
152153
aliceVision_multiview_test_data
153154
aliceVision_feature
154155
aliceVision_system
155-
${LEMON_LIBRARY}
156+
LEMON::lemon
156157
)
157158

158159
alicevision_add_test(bundle/bundleAdjustment_Enhanced_test.cpp
@@ -162,7 +163,7 @@ alicevision_add_test(bundle/bundleAdjustment_Enhanced_test.cpp
162163
aliceVision_multiview_test_data
163164
aliceVision_feature
164165
aliceVision_system
165-
${LEMON_LIBRARY}
166+
LEMON::lemon
166167
)
167168

168169
alicevision_add_test(bundle/bundleAdjustment_temporalConstraint_test.cpp
@@ -177,7 +178,7 @@ alicevision_add_test(utils/alignment_test.cpp
177178
aliceVision_sfm
178179
aliceVision_multiview
179180
aliceVision_multiview_test_data
180-
${LEMON_LIBRARY}
181+
LEMON::lemon
181182
)
182183

183184
alicevision_add_test(utils/poseFilter_test.cpp

src/aliceVision/track/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ alicevision_add_library(aliceVision_track
2424
aliceVision_matching
2525
aliceVision_stl
2626
Boost::json
27-
PRIVATE_LINKS
28-
${LEMON_LIBRARY}
27+
LEMON::lemon
2928
)
3029

3130
# Unit tests
@@ -44,4 +43,4 @@ if (ALICEVISION_BUILD_SWIG_BINDING)
4443
${Python3_INCLUDE_DIRS}
4544
${Python3_NumPy_INCLUDE_DIRS}
4645
)
47-
endif()
46+
endif()

src/software/utils/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ if (ALICEVISION_BUILD_SFM)
421421
Boost::program_options
422422
Boost::boost
423423
Boost::timer
424-
${LEMON_LIBRARY}
424+
LEMON::lemon
425425
)
426426

427427
# Keyframe selection

0 commit comments

Comments
 (0)