summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-24 18:32:05 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-24 18:32:05 (GMT)
commitcd935b03bfee380f6d2a3999dbc9bf6f929485bc (patch)
tree21b298f7dbe5d045cb67fd0717bae1606352cf2c
parent99575c9ac114e6f5d388e1ee7b9a3f788d773c9e (diff)
parent987d4a1240a7578804435f13f9021de47e93dada (diff)
downloadCMake-cd935b03bfee380f6d2a3999dbc9bf6f929485bc.zip
CMake-cd935b03bfee380f6d2a3999dbc9bf6f929485bc.tar.gz
CMake-cd935b03bfee380f6d2a3999dbc9bf6f929485bc.tar.bz2
Merge branch 'sln-no-bom' into release
-rw-r--r--Source/cmGlobalVisualStudio71Generator.cxx5
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx5
2 files changed, 0 insertions, 10 deletions
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 64f9cee..a67a649 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -93,11 +93,6 @@ void cmGlobalVisualStudio71Generator
cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators)
{
-#ifdef CMAKE_ENCODING_UTF8
- // Add UTF-8 BOM for .sln file to indicate encoding
- const unsigned char utf8_bom[3] = {0xEF,0xBB,0xBF};
- fout.write(reinterpret_cast<const char*>(utf8_bom), 3);
-#endif
// Write out the header for a SLN file
this->WriteSLNHeader(fout);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 0eb7d2c..401e475 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -558,11 +558,6 @@ void cmGlobalVisualStudio7Generator
cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators)
{
-#ifdef CMAKE_ENCODING_UTF8
- // Add UTF-8 BOM for .sln file to indicate encoding
- const unsigned char utf8_bom[3] = {0xEF,0xBB,0xBF};
- fout.write(reinterpret_cast<const char*>(utf8_bom), 3);
-#endif
// Write out the header for a SLN file
this->WriteSLNHeader(fout);