[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-705-gd608b74

[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  d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe (commit)
       via  4ee9005d7304f922c95db19ffab2a9da4145b93b (commit)
      from  1c381be5e1c8d01288ab198520141da5f7d74a8f (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=d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe
commit d608b74b92d989fb8ece93d7fdd729fe7ebc9cbe
Merge: 1c381be 4ee9005
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 10:37:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 24 10:37:07 2015 -0500

    Merge topic 'vs-midl-absolute-OutputDirectory' into next
    
    4ee9005d cmVisualStudio10TargetGenerator: Wrap long line


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ee9005d7304f922c95db19ffab2a9da4145b93b
commit 4ee9005d7304f922c95db19ffab2a9da4145b93b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 24 10:34:15 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 24 10:34:15 2015 -0500

    cmVisualStudio10TargetGenerator: Wrap long line

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index ca8310c..04d1487 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2522,7 +2522,8 @@ WriteMidlOptions(std::string const& /*config*/,
     }
   this->WriteString("%(AdditionalIncludeDirectories)"
                     "</AdditionalIncludeDirectories>\n", 0);
-  this->WriteString("<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>\n", 3);
+  this->WriteString("<OutputDirectory>$(ProjectDir)/$(IntDir)"
+                    "</OutputDirectory>\n", 3);
   this->WriteString("<HeaderFileName>%(Filename).h</HeaderFileName>\n", 3);
   this->WriteString(
     "<TypeLibraryName>%(Filename).tlb</TypeLibraryName>\n", 3);

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake