fix cmake&clang build

tesseract-ocr · Apr 6, 2019 · 95a15a7 · 95a15a7
1 parent ab09b09
commit 95a15a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,8 +111,8 @@ if (WIN32)
     if (MSVC)
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
+        add_definitions(-DNOMINMAX)
         if (NOT CLANG)
-            add_definitions(-DNOMINMAX)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
         endif()
     endif()

diff --git a/src/viewer/scrollview.cpp b/src/viewer/scrollview.cpp
@@ -18,8 +18,6 @@
 ///////////////////////////////////////////////////////////////////////
 //
 
-#define NOMINMAX
-
 #include <algorithm>
 #include <climits>
 #include <cstdarg>