From 983e4c1379626df82af31c1ed1098dfbae5e0cbe Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@intel.com>
Date: Tue, 21 May 2019 15:09:53 +0300
Subject: [PATCH] sfm: fix build with eigen

---
 modules/sfm/src/libmv_light/libmv/base/CMakeLists.txt    | 9 ---------
 .../src/libmv_light/libmv/correspondence/CMakeLists.txt  | 8 ++++++--
 .../sfm/src/libmv_light/libmv/multiview/CMakeLists.txt   | 5 ++++-
 modules/sfm/src/libmv_light/libmv/numeric/CMakeLists.txt | 6 ++++--
 .../src/libmv_light/libmv/simple_pipeline/CMakeLists.txt | 4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 modules/sfm/src/libmv_light/libmv/base/CMakeLists.txt

diff --git a/modules/sfm/src/libmv_light/libmv/base/CMakeLists.txt b/modules/sfm/src/libmv_light/libmv/base/CMakeLists.txt
deleted file mode 100644
index 5c54b1364..000000000
--- a/modules/sfm/src/libmv_light/libmv/base/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# define the source files
-SET(BASE_SRC )
-
-# define the header files (make the headers appear in IDEs.)
-FILE(GLOB BASE_HDRS *.h)
-
-ADD_LIBRARY(base STATIC ${BASE_SRC} ${BASE_HDRS})
-
-LIBMV_INSTALL_LIB(base)
\ No newline at end of file
diff --git a/modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt b/modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt
index 5aac7bab6..058ddceb5 100644
--- a/modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt
+++ b/modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt
@@ -8,6 +8,10 @@ FILE(GLOB CORRESPONDENCE_HDRS *.h)
 
 ADD_LIBRARY(correspondence STATIC ${CORRESPONDENCE_SRC} ${CORRESPONDENCE_HDRS})
 
-TARGET_LINK_LIBRARIES(correspondence multiview)
+TARGET_LINK_LIBRARIES(correspondence LINK_PRIVATE multiview)
+IF(TARGET Eigen3::Eigen)
+  TARGET_LINK_LIBRARIES(correspondence LINK_PUBLIC Eigen3::Eigen)
+ENDIF()
 
-LIBMV_INSTALL_LIB(correspondence)
\ No newline at end of file
+
+LIBMV_INSTALL_LIB(correspondence)
diff --git a/modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt b/modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt
index b99ffbe0a..5b4b40b95 100644
--- a/modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt
+++ b/modules/sfm/src/libmv_light/libmv/multiview/CMakeLists.txt
@@ -17,6 +17,9 @@ SET(MULTIVIEW_SRC conditioning.cc
 FILE(GLOB MULTIVIEW_HDRS *.h)
 
 ADD_LIBRARY(multiview STATIC ${MULTIVIEW_SRC} ${MULTIVIEW_HDRS})
-TARGET_LINK_LIBRARIES(multiview ${GLOG_LIBRARY} numeric)
+TARGET_LINK_LIBRARIES(multiview LINK_PRIVATE ${GLOG_LIBRARY} numeric)
+IF(TARGET Eigen3::Eigen)
+  TARGET_LINK_LIBRARIES(multiview LINK_PUBLIC Eigen3::Eigen)
+ENDIF()
 
 LIBMV_INSTALL_LIB(multiview)
diff --git a/modules/sfm/src/libmv_light/libmv/numeric/CMakeLists.txt b/modules/sfm/src/libmv_light/libmv/numeric/CMakeLists.txt
index 5ecd541cc..3de2f2fda 100644
--- a/modules/sfm/src/libmv_light/libmv/numeric/CMakeLists.txt
+++ b/modules/sfm/src/libmv_light/libmv/numeric/CMakeLists.txt
@@ -7,6 +7,8 @@ FILE(GLOB NUMERIC_HDRS *.h)
 
 ADD_LIBRARY(numeric STATIC ${NUMERIC_SRC} ${NUMERIC_HDRS})
 
-TARGET_LINK_LIBRARIES(numeric)
+IF(TARGET Eigen3::Eigen)
+  TARGET_LINK_LIBRARIES(numeric LINK_PUBLIC Eigen3::Eigen)
+ENDIF()
 
-LIBMV_INSTALL_LIB(numeric)
\ No newline at end of file
+LIBMV_INSTALL_LIB(numeric)
diff --git a/modules/sfm/src/libmv_light/libmv/simple_pipeline/CMakeLists.txt b/modules/sfm/src/libmv_light/libmv/simple_pipeline/CMakeLists.txt
index 42e379198..9426e2901 100644
--- a/modules/sfm/src/libmv_light/libmv/simple_pipeline/CMakeLists.txt
+++ b/modules/sfm/src/libmv_light/libmv/simple_pipeline/CMakeLists.txt
@@ -17,6 +17,6 @@ FILE(GLOB SIMPLE_PIPELINE_HDRS *.h)
 
 ADD_LIBRARY(simple_pipeline STATIC ${SIMPLE_PIPELINE_SRC} ${SIMPLE_PIPELINE_HDRS})
 
-TARGET_LINK_LIBRARIES(simple_pipeline multiview ${CERES_LIBRARIES})
+TARGET_LINK_LIBRARIES(simple_pipeline LINK_PRIVATE multiview ${CERES_LIBRARIES})
 
-LIBMV_INSTALL_LIB(simple_pipeline)
\ No newline at end of file
+LIBMV_INSTALL_LIB(simple_pipeline)