kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.

Browse Source
This commit is contained in:
Nils Gladitz 2015-03-27 12:22:15 +01:00
parent 685d179b8b
commit 98a3b2e29e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@ -430,7 +430,7 @@ void cmCPackWIXGenerator::AddDefinition(cmWIXSourceWriter& source,
tmp << name << "=\"" << value << '"'; tmp << name << "=\"" << value << '"';
source.AddProcessingInstruction("define", source.AddProcessingInstruction("define",
cmWIXSourceWriter::WindowsCodepageToUtf8(tmp.str())); cmWIXSourceWriter::CMakeEncodingToUtf8(tmp.str()));
} }
bool cmCPackWIXGenerator::CreateWiXSourceFiles() bool cmCPackWIXGenerator::CreateWiXSourceFiles()

10
Source/CPack/WiX/cmWIXSourceWriter.cxx
View File

@ -10,6 +10,8 @@
See the License for more information. See the License for more information.
============================================================================*/ ============================================================================*/
#include "cmStandardIncludes.h"
#include "cmWIXSourceWriter.h" #include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h> #include <CPack/cmCPackGenerator.h>
@ -118,7 +120,7 @@ void cmWIXSourceWriter::AddProcessingInstruction(
void cmWIXSourceWriter::AddAttribute( void cmWIXSourceWriter::AddAttribute(
std::string const& key, std::string const& value) std::string const& key, std::string const& value)
{ {
std::string utf8 = WindowsCodepageToUtf8(value); std::string utf8 = CMakeEncodingToUtf8(value);
File << " " << key << "=\"" << EscapeAttributeValue(utf8) << '"'; File << " " << key << "=\"" << EscapeAttributeValue(utf8) << '"';
} }
@ -132,8 +134,11 @@ void cmWIXSourceWriter::AddAttributeUnlessEmpty(
} }
} }
std::string cmWIXSourceWriter::WindowsCodepageToUtf8(std::string const& value) std::string cmWIXSourceWriter::CMakeEncodingToUtf8(std::string const& value)
{ {
#ifdef CMAKE_ENCODING_UTF8
return value;
#else
if(value.empty()) if(value.empty())
{ {
return std::string(); return std::string();
@ -167,6 +172,7 @@ std::string cmWIXSourceWriter::WindowsCodepageToUtf8(std::string const& value)
&utf8[0], static_cast<int>(utf8.size()), 0, 0); &utf8[0], static_cast<int>(utf8.size()), 0, 0);
return std::string(&utf8[0], utf8.size()); return std::string(&utf8[0], utf8.size());
#endif
} }

2
Source/CPack/WiX/cmWIXSourceWriter.h
View File

@ -43,7 +43,7 @@ public:
void AddAttributeUnlessEmpty( void AddAttributeUnlessEmpty(
std::string const& key, std::string const& value); std::string const& key, std::string const& value);
static std::string WindowsCodepageToUtf8(std::string const& value); static std::string CMakeEncodingToUtf8(std::string const& value);
protected: protected:
cmCPackLog* Logger; cmCPackLog* Logger;