[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-361-ga44391e

[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, next has been updated
       via  a44391e3b42ee480eaaf9704978f7b183c15249f (commit)
       via  485685fdd9dc4de8db8184c9f57f644575f1c129 (commit)
      from  d309b4feda99b7a3682947e79f24d7d33bed8447 (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=a44391e3b42ee480eaaf9704978f7b183c15249f
commit a44391e3b42ee480eaaf9704978f7b183c15249f
Merge: d309b4f 485685f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 6 16:34:39 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 6 11:34:42 2017 -0500

    Stage topic 'revert-CTestTestfile-removal'
    
    Topic-id: 22887
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/553


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=485685fdd9dc4de8db8184c9f57f644575f1c129
commit 485685fdd9dc4de8db8184c9f57f644575f1c129
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 6 11:30:45 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 6 11:31:19 2017 -0500

    Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"
    
    This reverts commit v3.8.0-rc1~305^2 (Remove CTestTestfile.cmake when
    BUILD_TESTING is OFF, 2016-11-14).  It breaks projects that never enable
    testing but create their own `CTestTestfile.cmake` manually instead.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 44c390c..7077bbb 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -214,14 +214,7 @@ void cmLocalGenerator::TraceDependencies()
 
 void cmLocalGenerator::GenerateTestFiles()
 {
-  std::string file = this->StateSnapshot.GetDirectory().GetCurrentBinary();
-  file += "/";
-  file += "CTestTestfile.cmake";
-
   if (!this->Makefile->IsOn("CMAKE_TESTING_ENABLED")) {
-    if (cmSystemTools::FileExists(file)) {
-      cmSystemTools::RemoveFile(file);
-    }
     return;
   }
 
@@ -230,6 +223,10 @@ void cmLocalGenerator::GenerateTestFiles()
   const std::string& config =
     this->Makefile->GetConfigurations(configurationTypes, false);
 
+  std::string file = this->StateSnapshot.GetDirectory().GetCurrentBinary();
+  file += "/";
+  file += "CTestTestfile.cmake";
+
   cmGeneratedFileStream fout(file.c_str());
   fout.SetCopyIfDifferent(true);
 

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

Summary of changes:
 Source/cmLocalGenerator.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake