From 2af485a28675b6f9c360e4732f84c62a6c03042f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Fri, 15 Apr 2011 20:49:21 +0100 Subject: [PATCH] Avoid min/max macro collision on MSVC. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 index fefd349..1131ae4 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -- 2.45.2