diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-16 13:52:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-16 13:52:42 (GMT) |
| commit | 67d5593efaecc706bf5f0bac5e34cb7a09227e10 (patch) | |
| tree | 1049a2de6250cb30f049a5ae71d8054fdbfe1d97 | |
| parent | 252c2f5ee20d3c4dcd44c00d218a4d4e32c1932c (diff) | |
| parent | 9557b403f521d4f537bbedb9ba00836fb7ebb70c (diff) | |
| download | CMake-67d5593efaecc706bf5f0bac5e34cb7a09227e10.zip CMake-67d5593efaecc706bf5f0bac5e34cb7a09227e10.tar.gz CMake-67d5593efaecc706bf5f0bac5e34cb7a09227e10.tar.bz2 | |
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
| -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 2c25e9b..ff6e2b7 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -44,6 +44,10 @@ #include "cmELF.h" #endif +#if defined(_WIN32) +#include <windows.h> +#endif + class cmSystemToolsFileTime; // Table of permissions flags. @@ -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=" |