[Cmake-commits] CMake branch, next, updated. v3.3.1-3007-ga0f72e6

[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  a0f72e6bd9cd4a9d9c75843d045a29db85e9d8d2 (commit)
       via  e78b540825d31b2f8402507abcd6f68c7a672c5c (commit)
      from  f1591efe91e174c878a87d4f3b8d0b7152c81ef6 (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=a0f72e6bd9cd4a9d9c75843d045a29db85e9d8d2
commit a0f72e6bd9cd4a9d9c75843d045a29db85e9d8d2
Merge: f1591ef e78b540
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 16 16:11:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 16 16:11:17 2015 -0400

    Merge topic 'ms-manifest-files' into next
    
    e78b5408 fixup! Add support for *.manifest source files with MSVC tools


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e78b540825d31b2f8402507abcd6f68c7a672c5c
commit e78b540825d31b2f8402507abcd6f68c7a672c5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 16 16:09:24 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 16 16:09:24 2015 -0400

    fixup! Add support for *.manifest source files with MSVC tools

diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx
index 1ce96e1..252e231 100644
--- a/Source/cmCommonTargetGenerator.cxx
+++ b/Source/cmCommonTargetGenerator.cxx
@@ -423,7 +423,7 @@ std::string cmCommonTargetGenerator::GetManifests()
        mi != manifest_srcs.end(); ++mi)
     {
     manifests.push_back(this->Convert((*mi)->GetFullPath(),
-                                      cmOutputConverter::START_OUTPUT,
+                                      this->WorkingDirectory,
                                       cmOutputConverter::SHELL));
     }
 

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

Summary of changes:
 Source/cmCommonTargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake