diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-15 14:26:55 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-15 14:26:55 -0400 |
| commit | 4fd61a60f12ad68622282cca3bd6e5ba9832d895 (patch) | |
| tree | d51890e5930d0eb5041894d4e6c7959a77b25cc6 | |
| parent | 7ab585dbc298307ea956ae8e5ee69097ab045386 (diff) | |
| parent | 9557b403f521d4f537bbedb9ba00836fb7ebb70c (diff) | |
| download | cmake-4fd61a60f12ad68622282cca3bd6e5ba9832d895.tar.gz | |
Merge branch 'mingw-w64-compile' into release
| -rw-r--r-- | Source/cmFileCommand.cxx | 4 | ||||
| -rwxr-xr-x | bootstrap | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 91cecb359f..dc97e37e36 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -42,6 +42,10 @@ #include "cmFileLockResult.h" #endif +#if defined(_WIN32) +#include <windows.h> +#endif + class cmSystemToolsFileTime; // Table of permissions flags. @@ -1419,6 +1419,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=" |