Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

cmConfigure.h: Tell windows.h not to define min/max macros

Browse Source
This commit is contained in:
Brad King
2019-08-19 15:39:02 -04:00
parent a0c8405d68
commit 141e307484
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmConfigure.cmake.h.in
View File

@@ -26,4 +26,8 @@
#define CM_FALLTHROUGH cmsys_FALLTHROUGH #define CM_FALLTHROUGH cmsys_FALLTHROUGH
#if defined(_WIN32) && !defined(NOMINMAX)
# define NOMINMAX
#endif
#endif #endif

6
bootstrap
View File

@@ -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 CMAKE_DATA_DIR \"/bootstrap-not-insalled\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH" 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 # Regenerate configured headers
for h in Configure VersionConfig; do for h in Configure VersionConfig; do
if "${_diff}" cm${h}.h cm${h}.h${_tmp} > /dev/null 2> /dev/null; then if "${_diff}" cm${h}.h cm${h}.h${_tmp} > /dev/null 2> /dev/null; then