[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-707-g172ea18

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  172ea187ef9486df4e1fe41cb6c6774e86a8bd46 (commit)
       via  987d4a1240a7578804435f13f9021de47e93dada (commit)
      from  d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=172ea187ef9486df4e1fe41cb6c6774e86a8bd46
commit 172ea187ef9486df4e1fe41cb6c6774e86a8bd46
Merge: d608b74 987d4a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 13:32:00 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 13:32:00 2015 -0500

    Merge topic 'sln-no-bom' into next
    
    987d4a12 VS: Do not generate a BOM in .sln files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=987d4a1240a7578804435f13f9021de47e93dada
commit 987d4a1240a7578804435f13f9021de47e93dada
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 13:29:42 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 13:30:50 2015 -0500

    VS: Do not generate a BOM in .sln files
    
    Revert commit v3.2.0-rc1~165^2 (Encoding:  Write Visual Studio solution
    file with BOM, 2014-12-26).  The BOM breaks the VS IDE version selector
    when loading the .sln from Windows Explorer.

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);
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio71Generator.cxx |    5 -----
 Source/cmGlobalVisualStudio7Generator.cxx  |    5 -----
 2 files changed, 10 deletions(-)


hooks/post-receive
-- 
CMake