diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 13:22:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-07 13:22:08 (GMT) |
| commit | b4fab15fc75e4ad62ece05dc9a37bd87e807ba9b (patch) | |
| tree | 2a6e813512d1594f6baec318e385e153af03d8d2 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | cb5cadf3c79bf2d80dbd1e2f5602ed709fe25ef5 (diff) | |
| parent | c666f8cbc6cb81b0729e116890c70096fd2101ac (diff) | |
| download | CMake-b4fab15fc75e4ad62ece05dc9a37bd87e807ba9b.zip CMake-b4fab15fc75e4ad62ece05dc9a37bd87e807ba9b.tar.gz CMake-b4fab15fc75e4ad62ece05dc9a37bd87e807ba9b.tar.bz2 | |
Merge topic 'nmake-encoding'
c666f8cb NMake: Use ANSI encoding for NMake Makefiles
f00214aa cmGeneratedFileStream: Add optional encoding support
bb1d3370 codecvt: Add class for encoding conversion
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 95f6ea8..daacef0 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -201,7 +201,8 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2() this->GetCMakeInstance()->GetHomeOutputDirectory(); makefileName += cmake::GetCMakeFilesDirectory(); makefileName += "/Makefile2"; - cmGeneratedFileStream makefileStream(makefileName.c_str()); + cmGeneratedFileStream makefileStream(makefileName.c_str(), false, + this->GetMakefileEncoding()); if (!makefileStream) { return; } |