Skip to content

Commit 5cc328d

Browse files
committed
Merge pull request #3083 from sergiud:win32-sfm-no-minmax-macros
2 parents a1eec28 + e332bce commit 5cc328d

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

modules/sfm/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ ocv_add_module(sfm
117117

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

120+
if(WIN32)
121+
# Avoid error due to min/max being already defined as a macro
122+
add_definitions(-DNOMINMAX)
123+
endif(WIN32)
124+
120125
ocv_warnings_disable(CMAKE_CXX_FLAGS
121126
-Wundef
122127
-Wshadow

0 commit comments

Comments
 (0)