[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-482-gee304e8

[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  ee304e8a3b7e3eae55cbf7ef06589f27441c1bf8 (commit)
       via  70e268da3e5f8e00bdf065786cd685a9660fe1c4 (commit)
       via  47092d3e809be971264a8d5416ff3cb9255f6565 (commit)
       via  7db671a14374fdbfb8ae87ab9618bca111f4e8a5 (commit)
      from  1ed28ad0edd0e85f7d4a03be5c0d38bf36203437 (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=ee304e8a3b7e3eae55cbf7ef06589f27441c1bf8
commit ee304e8a3b7e3eae55cbf7ef06589f27441c1bf8
Merge: 1ed28ad 70e268d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 14 09:46:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 14 09:46:39 2016 -0400

    Merge topic 'cmcldeps-more-safety' into next
    
    70e268da cmcldeps: prefer the /TC flag
    47092d3e cmcldeps: append strings as strings
    7db671a1 cmcldeps: search for single-byte strings as characters


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70e268da3e5f8e00bdf065786cd685a9660fe1c4
commit 70e268da3e5f8e00bdf065786cd685a9660fe1c4
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Oct 13 12:48:37 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Oct 14 09:27:43 2016 -0400

    cmcldeps: prefer the /TC flag
    
    The /TC flag causes all source files to be processed as C source files.
    We know that there is only one, so this is safe.

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index bfbb5fd..b86ad6e 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -279,12 +279,7 @@ int main()
     clrest = replace(clrest, "/fo", "/out:");
     clrest = replace(clrest, objfile, objfile + ".dep.obj ");
 
-    // rc: src\x\x.rc  ->  cl: /Tc src\x\x.rc
-    if (srcfile.find(' ') != std::string::npos)
-      srcfile = "\"" + srcfile + "\"";
-    clrest = replace(clrest, srcfile, "/Tc " + srcfile);
-
-    cl = "\"" + cl + "\" /P /DRC_INVOKED ";
+    cl = "\"" + cl + "\" /P /DRC_INVOKED /TC ";
 
     // call cl in object dir so the .i is generated there
     std::string objdir;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47092d3e809be971264a8d5416ff3cb9255f6565
commit 47092d3e809be971264a8d5416ff3cb9255f6565
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Oct 13 12:48:24 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Oct 14 09:27:43 2016 -0400

    cmcldeps: append strings as strings

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index aed67b9..bfbb5fd 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -205,7 +205,7 @@ static int process(const std::string& srcfilename, const std::string& dfile,
   std::vector<std::string> command;
   for (std::vector<std::string>::iterator i = args.begin(); i != args.end();
        ++i) {
-    command.push_back(i->c_str());
+    command.push_back(*i);
   }
   // run the command
   int exit_code = 0;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7db671a14374fdbfb8ae87ab9618bca111f4e8a5
commit 7db671a14374fdbfb8ae87ab9618bca111f4e8a5
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Oct 13 12:47:50 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Oct 14 09:27:43 2016 -0400

    cmcldeps: search for single-byte strings as characters

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 167d60a..aed67b9 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -258,7 +258,7 @@ int main()
   // needed to suppress filename output of msvc tools
   std::string srcfilename;
   {
-    std::string::size_type pos = srcfile.rfind("\\");
+    std::string::size_type pos = srcfile.rfind('\\');
     if (pos == std::string::npos) {
       srcfilename = srcfile;
     } else {
@@ -280,7 +280,7 @@ int main()
     clrest = replace(clrest, objfile, objfile + ".dep.obj ");
 
     // rc: src\x\x.rc  ->  cl: /Tc src\x\x.rc
-    if (srcfile.find(" ") != std::string::npos)
+    if (srcfile.find(' ') != std::string::npos)
       srcfile = "\"" + srcfile + "\"";
     clrest = replace(clrest, srcfile, "/Tc " + srcfile);
 

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

Summary of changes:
 Source/cmcldeps.cxx |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake