Merge topic 'mingw-w64-compile'

9557b403 cmFileCommand: Fix build on mingw-w64
845f5e3c bootstrap: fix build on mingw-w64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !837
This commit is contained in:
Brad King 2017-05-16 13:52:39 +00:00 committed by Kitware Robot
commit 67d5593efa
2 changed files with 5 additions and 0 deletions

View File

@ -44,6 +44,10 @@
#include "cmELF.h"
#endif
#if defined(_WIN32)
#include <windows.h>
#endif
class cmSystemToolsFileTime;
// Table of permissions flags.

View File

@ -1428,6 +1428,7 @@ fi
cmake_c_flags_String="-DKWSYS_STRING_C"
if ${cmake_system_mingw}; then
cmake_c_flags_EncodingC="-DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_ACP"
cmake_cxx_flags_EncodingCXX="${cmake_c_flags_EncodingC}"
cmake_cxx_flags_cmProcessOutput="${cmake_c_flags_EncodingC}"
fi
cmake_cxx_flags_SystemTools="