diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-19 19:39:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-20 13:36:45 (GMT) |
| commit | 141e3074845675d37a8c7f7c3efcc09d0ab5158c (patch) | |
| tree | dd85686887aa32a4e7b6d387bd96268344f776ae | |
| parent | a0c8405d681d504f5d96489c2b5d44f10a29c6ed (diff) | |
| download | CMake-141e3074845675d37a8c7f7c3efcc09d0ab5158c.zip CMake-141e3074845675d37a8c7f7c3efcc09d0ab5158c.tar.gz CMake-141e3074845675d37a8c7f7c3efcc09d0ab5158c.tar.bz2 | |
cmConfigure.h: Tell windows.h not to define min/max macros
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 4 | ||||
| -rwxr-xr-x | bootstrap | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 19b1cd4..4de1c5d 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -26,4 +26,8 @@ #define CM_FALLTHROUGH cmsys_FALLTHROUGH +#if defined(_WIN32) && !defined(NOMINMAX) +# define NOMINMAX +#endif + #endif @@ -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 |