Skip to content

Commit 983e4c1

Browse files
committed
sfm: fix build with eigen
1 parent d24b025 commit 983e4c1

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

modules/sfm/src/libmv_light/libmv/base/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ FILE(GLOB CORRESPONDENCE_HDRS *.h)
88

99
ADD_LIBRARY(correspondence STATIC ${CORRESPONDENCE_SRC} ${CORRESPONDENCE_HDRS})
1010

11-
TARGET_LINK_LIBRARIES(correspondence multiview)
11+
TARGET_LINK_LIBRARIES(correspondence LINK_PRIVATE multiview)
12+
IF(TARGET Eigen3::Eigen)
13+
TARGET_LINK_LIBRARIES(correspondence LINK_PUBLIC Eigen3::Eigen)
14+
ENDIF()
1215

13-
LIBMV_INSTALL_LIB(correspondence)
16+
17+
LIBMV_INSTALL_LIB(correspondence)

modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ SET(MULTIVIEW_SRC conditioning.cc
1717
FILE(GLOB MULTIVIEW_HDRS *.h)
1818

1919
ADD_LIBRARY(multiview STATIC ${MULTIVIEW_SRC} ${MULTIVIEW_HDRS})
20-
TARGET_LINK_LIBRARIES(multiview ${GLOG_LIBRARY} numeric)
20+
TARGET_LINK_LIBRARIES(multiview LINK_PRIVATE ${GLOG_LIBRARY} numeric)
21+
IF(TARGET Eigen3::Eigen)
22+
TARGET_LINK_LIBRARIES(multiview LINK_PUBLIC Eigen3::Eigen)
23+
ENDIF()
2124

2225
LIBMV_INSTALL_LIB(multiview)

modules/sfm/src/libmv_light/libmv/numeric/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ FILE(GLOB NUMERIC_HDRS *.h)
77

88
ADD_LIBRARY(numeric STATIC ${NUMERIC_SRC} ${NUMERIC_HDRS})
99

10-
TARGET_LINK_LIBRARIES(numeric)
10+
IF(TARGET Eigen3::Eigen)
11+
TARGET_LINK_LIBRARIES(numeric LINK_PUBLIC Eigen3::Eigen)
12+
ENDIF()
1113

12-
LIBMV_INSTALL_LIB(numeric)
14+
LIBMV_INSTALL_LIB(numeric)

modules/sfm/src/libmv_light/libmv/simple_pipeline/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ FILE(GLOB SIMPLE_PIPELINE_HDRS *.h)
1717

1818
ADD_LIBRARY(simple_pipeline STATIC ${SIMPLE_PIPELINE_SRC} ${SIMPLE_PIPELINE_HDRS})
1919

20-
TARGET_LINK_LIBRARIES(simple_pipeline multiview ${CERES_LIBRARIES})
20+
TARGET_LINK_LIBRARIES(simple_pipeline LINK_PRIVATE multiview ${CERES_LIBRARIES})
2121

22-
LIBMV_INSTALL_LIB(simple_pipeline)
22+
LIBMV_INSTALL_LIB(simple_pipeline)

0 commit comments

Comments
 (0)