[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1929-g821c131

[Stephen Kelly]

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  821c131b55fd2aefae81e8c417a6009bc1df1fb7 (commit)
       via  1f6edef657ea34c040dfb84a756c6c73c92b2ce6 (commit)
      from  85b895033e2f98990d3e98cdbac68cfe130e2a09 (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=821c131b55fd2aefae81e8c417a6009bc1df1fb7
commit 821c131b55fd2aefae81e8c417a6009bc1df1fb7
Merge: 85b8950 1f6edef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 04:01:59 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 6 04:01:59 2014 -0400

    Merge topic 'optimize-source-file-processing' into next
    
    1f6edef6 Simplify.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f6edef657ea34c040dfb84a756c6c73c92b2ce6
commit 1f6edef657ea34c040dfb84a756c6c73c92b2ce6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 6 09:56:40 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Apr 6 09:58:10 2014 +0200

    Simplify.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d8fa96e..d28ac3f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -840,9 +840,8 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
 
     if(!(src[0] == '$' && src[1] == '<'))
       {
-      bool hadError = false;
-      filename = this->ProcessSourceItemCMP0049(filename, hadError);
-      if (hadError)
+      filename = this->ProcessSourceItemCMP0049(filename);
+      if (cmSystemTools::GetErrorOccuredFlag())
         {
         return;
         }
@@ -866,8 +865,7 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs)
 }
 
 //----------------------------------------------------------------------------
-std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s,
-                                               bool& hadError)
+std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s)
 {
   std::string src = s;
 
@@ -903,7 +901,6 @@ std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s,
       if (messageType == cmake::FATAL_ERROR)
         {
         return "";
-        hadError = true;
         }
       }
     }
@@ -913,10 +910,9 @@ std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s,
 //----------------------------------------------------------------------------
 cmSourceFile* cmTarget::AddSourceCMP0049(const std::string& s)
 {
-  bool hadError = false;
-  std::string src = this->ProcessSourceItemCMP0049(s, hadError);
+  std::string src = this->ProcessSourceItemCMP0049(s);
 
-  if (hadError)
+  if (cmSystemTools::GetErrorOccuredFlag())
     {
     return 0;
     }
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7491dea..da9d0a1 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -752,7 +752,7 @@ private:
   void ComputeLinkClosure(const std::string& config, LinkClosure& lc,
                           cmTarget const* head) const;
 
-  std::string ProcessSourceItemCMP0049(const std::string& s, bool& hadError);
+  std::string ProcessSourceItemCMP0049(const std::string& s);
 
   void ClearLinkMaps();
 

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

Summary of changes:
 Source/cmTarget.cxx |   14 +++++---------
 Source/cmTarget.h   |    2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake