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 64aa41b2480384be22881a3bacc8960ec57b0f11 (commit)
via 4efda261fead9f677144ffc6bc2b612a1d1dbcb6 (commit)
from ce597a022b32231559c75843f4df6108120c5d57 (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=64aa41b2480384be22881a3bacc8960ec57b0f11
commit 64aa41b2480384be22881a3bacc8960ec57b0f11
Merge: ce597a0 4efda26
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 21 09:22:15 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jul 21 09:22:15 2015 -0400
Merge topic 'clean-up-include_regular_expression'
4efda261 cmMakefile: Remove special handling of INCLUDE_REGULAR_EXPRESSION.
diff --cc Source/cmMakefile.cxx
index 62d8002,155c306..5790b75
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -4256,22 -4258,9 +4249,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" )
-----------------------------------------------------------------------
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
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
