summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-19 19:39:02 (GMT)
committerBrad King <brad.king@kitware.com>2019-08-20 13:36:45 (GMT)
commit141e3074845675d37a8c7f7c3efcc09d0ab5158c (patch)
treedd85686887aa32a4e7b6d387bd96268344f776ae /bootstrap
parenta0c8405d681d504f5d96489c2b5d44f10a29c6ed (diff)
downloadCMake-141e3074845675d37a8c7f7c3efcc09d0ab5158c.zip
CMake-141e3074845675d37a8c7f7c3efcc09d0ab5158c.tar.gz
CMake-141e3074845675d37a8c7f7c3efcc09d0ab5158c.tar.bz2
cmConfigure.h: Tell windows.h not to define min/max macros
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap6
1 files changed, 6 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index 4581239..c7e3945 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1364,6 +1364,12 @@ cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"/bootstrap-not-insall
cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
+if ${cmake_system_mingw}; then
+ cmake_report cmConfigure.h${_tmp} "#if defined(_WIN32) && !defined(NOMINMAX)"
+ cmake_report cmConfigure.h${_tmp} "# define NOMINMAX"
+ cmake_report cmConfigure.h${_tmp} "#endif"
+fi
+
# Regenerate configured headers
for h in Configure VersionConfig; do
if "${_diff}" cm${h}.h cm${h}.h${_tmp} > /dev/null 2> /dev/null; then