]> git.cworth.org Git - apitrace/commitdiff
Avoid min/max macro collision on MSVC.
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 15 Apr 2011 19:49:21 +0000 (20:49 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 15 Apr 2011 19:49:21 +0000 (20:49 +0100)
CMakeLists.txt [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index fefd349..1131ae4
@@ -41,6 +41,9 @@ if (MSVC)
     # Enable math constants defines
     add_definitions (-D_USE_MATH_DEFINES)
 
+    # No min/max macros
+    add_definitions (-DNOMINMAX)
+
     # Adjust warnings
     add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
     add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)