[Cmake-commits] CMake branch, next, updated. v3.0.0-4229-g5872fac

[Ben Boeckel]

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  5872fac134116adb2c3ffe0b493b46b157c9fac7 (commit)
       via  4b139169702dec37039869cc4af064c18e6789b8 (commit)
      from  b16ffbd22ca372c99c1e538e0e0e0f9cbf6026ae (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=5872fac134116adb2c3ffe0b493b46b157c9fac7
commit 5872fac134116adb2c3ffe0b493b46b157c9fac7
Merge: b16ffbd 4b13916
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jul 14 12:55:35 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 14 12:55:35 2014 -0400

    Merge topic 'dev/fix-cmake-rule-property' into next
    
    4b139169 cmMakefile: fix __CMAKE_RULE property setting


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b139169702dec37039869cc4af064c18e6789b8
commit 4b139169702dec37039869cc4af064c18e6789b8
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jul 14 12:55:04 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jul 14 12:55:04 2014 -0400

    cmMakefile: fix __CMAKE_RULE property setting
    
    It got put into the condition by mistake.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2218e2f..d3ca34a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1042,8 +1042,8 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
     if (!file)
       {
       file = this->CreateSource(outName, true);
-      file->SetProperty("__CMAKE_RULE", "1");
       }
+    file->SetProperty("__CMAKE_RULE", "1");
     }
 
   // Always create the output sources and mark them generated.

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

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


hooks/post-receive
-- 
CMake