Merge topic 'mingw-w64-compile'

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

Acked-by: Kitware Robot <[email protected]>
Merge-request: !837

Source/cmFileCommand.cxx

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

bootstrap

@@ -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="