diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2015-03-27 11:22:15 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2015-03-27 11:22:15 (GMT) |
| commit | 98a3b2e29ece5195e7948681a410bc5fae880a23 (patch) | |
| tree | 571243d44b4bdfbb660e6fad7e1abc6b03e66ccb /Source/CPack/WiX/cmCPackWIXGenerator.cxx | |
| parent | 685d179b8b8e0f0b98dbfd227f6ccd88b17749b0 (diff) | |
| download | CMake-98a3b2e29ece5195e7948681a410bc5fae880a23.zip CMake-98a3b2e29ece5195e7948681a410bc5fae880a23.tar.gz CMake-98a3b2e29ece5195e7948681a410bc5fae880a23.tar.bz2 | |
CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.
Diffstat (limited to 'Source/CPack/WiX/cmCPackWIXGenerator.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 257ce7a..99eabf2 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -430,7 +430,7 @@ void cmCPackWIXGenerator::AddDefinition(cmWIXSourceWriter& source, tmp << name << "=\"" << value << '"'; source.AddProcessingInstruction("define", - cmWIXSourceWriter::WindowsCodepageToUtf8(tmp.str())); + cmWIXSourceWriter::CMakeEncodingToUtf8(tmp.str())); } bool cmCPackWIXGenerator::CreateWiXSourceFiles() |