[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1127-g257ba13

[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  257ba138b44872dbe305b3ef6d6d1685c00647fe (commit)
       via  4efda261fead9f677144ffc6bc2b612a1d1dbcb6 (commit)
      from  e0167a141f74b7f39471150010c328202b4859b7 (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=257ba138b44872dbe305b3ef6d6d1685c00647fe
commit 257ba138b44872dbe305b3ef6d6d1685c00647fe
Merge: e0167a1 4efda26
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 08:10:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 18 08:10:59 2015 -0400

    Merge topic 'clean-up-include_regular_expression' into next
    
    4efda261 cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.

diff --cc Source/cmMakefile.cxx
index 416b2c5,155c306..21c3a38
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -4225,22 -4258,9 +4218,17 @@@ const char *cmMakefile::GetProperty(con
        }
      return "";
      }
-   else if (prop == "INCLUDE_REGULAR_EXPRESSION" )
-     {
-     output = this->GetIncludeRegularExpression();
-     return output.c_str();
-     }
    else if (prop == "LISTFILE_STACK")
      {
 -    output = cmJoin(this->ListFileStack, ";");
 +    std::vector<std::string> listFiles;
 +    cmState::Snapshot snp = this->StateSnapshot;
 +    while (snp.IsValid())
 +      {
 +      listFiles.push_back(snp.GetExecutionListFile());
 +      snp = snp.GetCallStackParent();
 +      }
 +    std::reverse(listFiles.begin(), listFiles.end());
 +    output = cmJoin(listFiles, ";");
      return output.c_str();
      }
    else if ( prop == "CACHE_VARIABLES" )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4efda261fead9f677144ffc6bc2b612a1d1dbcb6
commit 4efda261fead9f677144ffc6bc2b612a1d1dbcb6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 4 19:21:56 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 14:10:34 2015 +0200

    cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.
    
    It costs an extra cmMakefile member and extra code to maintain in
    directory property handling.  Remove documentation note that it
    is read-only and specify high-level command to populate it.

diff --git a/Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst b/Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst
index befafa5..bb90c61 100644
--- a/Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst
+++ b/Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst
@@ -3,6 +3,7 @@ INCLUDE_REGULAR_EXPRESSION
 
 Include file scanning regular expression.
 
-This read-only property specifies the regular expression used during
+This property specifies the regular expression used during
 dependency scanning to match include files that should be followed.
-See the include_regular_expression command.
+See the :command:`include_regular_expression` command for a high-level
+interface to set this property.
diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx
index a6d4e58..cbc7e02 100644
--- a/Source/cmMakeDepend.cxx
+++ b/Source/cmMakeDepend.cxx
@@ -49,7 +49,7 @@ void cmMakeDepend::SetMakefile(cmMakefile* makefile)
 
   // Now extract the include file regular expression from the makefile.
   this->IncludeFileRegularExpression.compile(
-    this->Makefile->IncludeFileRegularExpression.c_str());
+    this->Makefile->GetIncludeRegularExpression());
   this->ComplainFileRegularExpression.compile(
     this->Makefile->ComplainFileRegularExpression.c_str());
 
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 07c2fd1..155c306 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -150,7 +150,7 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
   this->SuppressWatches = false;
 
   // Setup the default include file regular expression (match everything).
-  this->IncludeFileRegularExpression = "^.*$";
+  this->SetProperty("INCLUDE_REGULAR_EXPRESSION", "^.*$");
   // Setup the default include complaint regular expression (match nothing).
   this->ComplainFileRegularExpression = "^$";
   // Source and header file extensions that we can handle
@@ -1613,7 +1613,6 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
   this->ProjectName = parent->ProjectName;
 
   // Copy include regular expressions.
-  this->IncludeFileRegularExpression = parent->IncludeFileRegularExpression;
   this->ComplainFileRegularExpression = parent->ComplainFileRegularExpression;
 
   // Imported targets.
@@ -4193,12 +4192,6 @@ void cmMakefile::SetProperty(const std::string& prop, const char* value)
     return;
     }
 
-  if ( prop == "INCLUDE_REGULAR_EXPRESSION" )
-    {
-    this->SetIncludeRegularExpression(value);
-    return;
-    }
-
   this->Properties.SetProperty(prop, value);
 }
 
@@ -4265,11 +4258,6 @@ const char *cmMakefile::GetProperty(const std::string& prop,
       }
     return "";
     }
-  else if (prop == "INCLUDE_REGULAR_EXPRESSION" )
-    {
-    output = this->GetIncludeRegularExpression();
-    return output.c_str();
-    }
   else if (prop == "LISTFILE_STACK")
     {
     output = cmJoin(this->ListFileStack, ";");
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 82a2279..585880e 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -387,11 +387,11 @@ public:
    */
   void SetIncludeRegularExpression(const char* regex)
     {
-      this->IncludeFileRegularExpression = regex;
+      this->SetProperty("INCLUDE_REGULAR_EXPRESSION", regex);
     }
   const char* GetIncludeRegularExpression() const
     {
-      return this->IncludeFileRegularExpression.c_str();
+      return this->GetProperty("INCLUDE_REGULAR_EXPRESSION");
     }
 
   /**
@@ -873,7 +873,6 @@ protected:
   std::vector<cmInstallGenerator*> InstallGenerators;
   std::vector<cmTestGenerator*> TestGenerators;
 
-  std::string IncludeFileRegularExpression;
   std::string ComplainFileRegularExpression;
   std::vector<std::string> SourceFileExtensions;
   std::vector<std::string> HeaderFileExtensions;

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

Summary of changes:
 Help/prop_dir/INCLUDE_REGULAR_EXPRESSION.rst |    5 +++--
 Source/cmMakeDepend.cxx                      |    2 +-
 Source/cmMakefile.cxx                        |   14 +-------------
 Source/cmMakefile.h                          |    5 ++---
 4 files changed, 7 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake