[Cmake-commits] CMake branch, master, updated. v3.14.0-380-ga6d8165

[Kitware Robot]

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, master has been updated
       via  a6d8165dd2abe81dd133d188c8fe81323944c469 (commit)
       via  5940d18e49fd7269e611fd020b97279a2c9e1942 (commit)
       via  5b6c6c2d80c6dee20b84dbec64e42ce2d426d33e (commit)
       via  0e652f2defb3ebb700a39fd2d2e1bdd8605ca5b4 (commit)
       via  b5b24158ce41ec376e6ba36fa44f7b160c03b4f8 (commit)
       via  76e6e01c6ca67f1449a2bcd1f434657de7f0240b (commit)
       via  414332ff57650862face4b23872062c4b4e018ca (commit)
      from  0db702c7024a507f5c2ab67522d1d2a7699df611 (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=a6d8165dd2abe81dd133d188c8fe81323944c469
commit a6d8165dd2abe81dd133d188c8fe81323944c469
Merge: 5940d18 76e6e01
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 15 14:27:48 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 15 10:27:55 2019 -0400

    Merge topic 'ninja-dyndep-touchups'
    
    76e6e01c6c cmNinjaTargetGenerator: use a different depfile for preprocessing
    414332ff57 cmake_ninja_dyndep: don't duplicate slashes
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3093


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5940d18e49fd7269e611fd020b97279a2c9e1942
commit 5940d18e49fd7269e611fd020b97279a2c9e1942
Merge: 0db702c 5b6c6c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 15 10:27:06 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 15 10:27:06 2019 -0400

    Merge branch 'release-3.14'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76e6e01c6ca67f1449a2bcd1f434657de7f0240b
commit 76e6e01c6ca67f1449a2bcd1f434657de7f0240b
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 12 15:25:03 2019 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 12 15:37:07 2019 -0400

    cmNinjaTargetGenerator: use a different depfile for preprocessing
    
    If the compile rule also needs a depfile, the names now no longer
    collide.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 8d11408..1ad26dd 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -1113,7 +1113,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
 
     // Explicit preprocessing always uses a depfile.
     ppVars["DEP_FILE"] = this->GetLocalGenerator()->ConvertToOutputFormat(
-      objectFileName + ".d", cmOutputConverter::SHELL);
+      objectFileName + ".pp.d", cmOutputConverter::SHELL);
     if (compilePP) {
       // The actual compilation does not need a depfile because it
       // depends on the already-preprocessed source.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414332ff57650862face4b23872062c4b4e018ca
commit 414332ff57650862face4b23872062c4b4e018ca
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 12 15:24:38 2019 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 12 15:37:07 2019 -0400

    cmake_ninja_dyndep: don't duplicate slashes

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 841587c..e443678 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1997,7 +1997,7 @@ int cmcmd_cmake_ninja_dyndep(std::vector<std::string>::const_iterator argBeg,
   std::string const dir_top_bld = tdi["dir-top-bld"].asString();
   std::string const dir_top_src = tdi["dir-top-src"].asString();
   std::string module_dir = tdi["module-dir"].asString();
-  if (!module_dir.empty()) {
+  if (!module_dir.empty() && !cmHasLiteralSuffix(module_dir, "/")) {
     module_dir += "/";
   }
   std::vector<std::string> linked_target_dirs;

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx | 2 +-
 Source/cmNinjaTargetGenerator.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake