Merge remote-tracking branch 'upstream/3.4' into merge-3.4

alalek · alalek · commit 3db7682c037a · 2021-10-23T15:31:24.000Z
diff --git a/modules/cvv/CMakeLists.txt b/modules/cvv/CMakeLists.txt
@@ -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()
diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if(NOT HAVE_QT5 OR NOT HAVE_CXX11)`
	`1`	`+if(NOT HAVE_QT OR NOT HAVE_CXX11 OR QT_VERSION_MAJOR LESS 5)`
`2`	`2`	`ocv_module_disable(cvv)`
`3`	`3`	`return()`
`4`	`4`	`endif()`