[Cmake-commits] CMake branch, next, updated. v3.5.0-496-g258a5e4

[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  258a5e4af93cea48e99abe3bd8ec155fe6205c42 (commit)
       via  a3bcf2aa2c1d37c769b0cb6da06b184db1d0c99b (commit)
      from  f46257f9c6ac6f74fd9a9fcbe20e6b537b771aa7 (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=258a5e4af93cea48e99abe3bd8ec155fe6205c42
commit 258a5e4af93cea48e99abe3bd8ec155fe6205c42
Merge: f46257f a3bcf2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 17 09:40:59 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 17 09:40:59 2016 -0400

    Merge topic 'vs-remote-directory' into next
    
    a3bcf2aa VS: Fix WinCE remote debugger tool per-config target name


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3bcf2aa2c1d37c769b0cb6da06b184db1d0c99b
commit a3bcf2aa2c1d37c769b0cb6da06b184db1d0c99b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 17 09:37:01 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 17 09:37:51 2016 -0400

    VS: Fix WinCE remote debugger tool per-config target name
    
    Fix the DebuggerTool RemoteExecutable value added by commit a22f9967
    (VS: Optionally generate remote directory for WinCE projects,
    2016-02-15) to account for the configuration when computing the target
    name.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 3e5611b..abae564 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1389,7 +1389,8 @@ void cmLocalVisualStudio7Generator::OutputDeploymentDebuggerTool(
         "\t\t\t\tRegisterOutput=\"0\"\n"
         "\t\t\t\tAdditionalFiles=\"\"/>\n"
         ;
-      std::string const exe = dir + std::string("\\") + target->GetFullName();
+      std::string const exe =
+        dir + std::string("\\") + target->GetFullName(config);
       fout <<
         "\t\t\t<DebuggerTool\n"
         "\t\t\t\tRemoteExecutable=\"" << this->EscapeForXML(exe) << "\"\n"

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

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


hooks/post-receive
-- 
CMake