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

3 years ago · 3db7682c03
parent 71f9dbd144 5cc328d37a
commit 3db7682c03
2 changed files with 6 additions and 1 deletions
--- 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()
--- 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