[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-525-g4e8742d

Brad King brad.king at kitware.com
Thu Feb 23 14:29:57 EST 2017


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  4e8742d78f9176a3476ec442d7353fc4b3a7a58a (commit)
       via  2cb165e8c0943baa8bc05e97ef89b5e0b0261297 (commit)
      from  9870ed61b83cd7b822d47a955f0c0e2543d065a7 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e8742d78f9176a3476ec442d7353fc4b3a7a58a
commit 4e8742d78f9176a3476ec442d7353fc4b3a7a58a
Merge: 9870ed6 2cb165e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 14:29:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 14:29:55 2017 -0500

    Merge topic 'vcxproj-indentation' into next
    
    2cb165e8 VS: Fix .vcxproj indentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cb165e8c0943baa8bc05e97ef89b5e0b0261297
commit 2cb165e8c0943baa8bc05e97ef89b5e0b0261297
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 13:38:47 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 13:38:47 2017 -0500

    VS: Fix .vcxproj indentation
    
    In commit v3.8.0-rc1~87^2~1 (VS: added support for C#, 2017-01-09) we
    removed what looked like a no-op streaming operation but in fact it
    is responsible for applying indentation.  Restore the line.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 2e6c19b..21bb774 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -130,6 +130,7 @@ void cmVisualStudio10TargetGenerator::WritePlatformConfigTag(
   }
   stream->fill(' ');
   stream->width(indentLevel * 2);
+  (*stream) << ""; // applies indentation
   (*stream) << "<" << tag << " Condition=\"";
   (*stream) << "'$(Configuration)|$(Platform)'=='";
   (*stream) << config << "|" << this->Platform;

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list