Skip to content

(4.x) Merge 3.4 #3087

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 5 commits into from
Oct 23, 2021
Merged

(4.x) Merge 3.4 #3087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a4348e
opencv-4.5.4 enable_cvv fixes #3063
sergiomb2 Oct 14, 2021
a1eec28
Merge pull request #3072 from sergiomb2:master
alalek Oct 18, 2021
e332bce
win32: use NOMINMAX to avoid min/max macros being defined
sergiud Oct 19, 2021
5cc328d
Merge pull request #3083 from sergiud:win32-sfm-no-minmax-macros
alalek Oct 20, 2021
3db7682
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Oct 23, 2021
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/cvv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if(NOT HAVE_QT5 OR NOT HAVE_CXX11)
if(NOT HAVE_QT OR NOT HAVE_CXX11 OR QT_VERSION_MAJOR LESS 5)
ocv_module_disable(cvv)
return()
endif()
Expand Down
5 changes: 5 additions & 0 deletions modules/sfm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ ocv_add_module(sfm

add_definitions(/DGLOG_NO_ABBREVIATED_SEVERITIES) # avoid ERROR macro conflict in glog (ceres dependency)

if(WIN32)
# Avoid error due to min/max being already defined as a macro
add_definitions(-DNOMINMAX)
endif(WIN32)

ocv_warnings_disable(CMAKE_CXX_FLAGS
-Wundef
-Wshadow
Expand Down