Skip to content

(4.x) Merge 3.4 #3172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 6, 2022
Merged

(4.x) Merge 3.4 #3172

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1200c5
cmake(sfm): fix sfm static target dependencies
alalek Feb 3, 2022
4f76f2f
Merge pull request #3169 from alalek:cmake_fix_sfm_build
alalek Feb 3, 2022
37570fa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/sfm/src/libmv_light/libmv/correspondence/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FILE(GLOB CORRESPONDENCE_HDRS *.h)

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

TARGET_LINK_LIBRARIES(correspondence LINK_PRIVATE ${GLOG_LIBRARIES} multiview)
ocv_target_link_libraries(correspondence LINK_PRIVATE ${GLOG_LIBRARIES} multiview opencv_imgcodecs)
IF(TARGET Eigen3::Eigen)
TARGET_LINK_LIBRARIES(correspondence LINK_PUBLIC Eigen3::Eigen)
ENDIF()
Expand Down