diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-07 13:53:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-07-07 13:53:46 (GMT) |
| commit | b33b5cd3170c08f61cbc05fc2a2e462a09703879 (patch) | |
| tree | a52e3b371bfc7ca67f4f5c6b8db3056046eb6652 /Source/cmMacroCommand.cxx | |
| parent | 18fdf13192ba1f1e8ac84b29f44d3d0b0549607e (diff) | |
| parent | d2475bb5c4488a0ef6015f13ee46ddc7a2e4455b (diff) | |
| download | CMake-b33b5cd3170c08f61cbc05fc2a2e462a09703879.zip CMake-b33b5cd3170c08f61cbc05fc2a2e462a09703879.tar.gz CMake-b33b5cd3170c08f61cbc05fc2a2e462a09703879.tar.bz2 | |
Merge topic 'refactor-cmListFileBacktrace'
d2475bb5 cmListFileBacktrace: Implement in terms of cmState::Snapshot.
238aac23 cmListFile: Remove FilePath member from cmListFileContext.
329098a9 cmMakefile: Set the FilePath on the frame from the cmState.
91158a33 cmMakefile: Create intermediate variables for snapshot frames.
821f91d6 cmMakefile: Create a scoped context for parsing listfiles.
30d44efa cmMakefile: Access the execution list file from the cmState.
6361f680 cmState: Store execution context.
94704d75 cmState: Add GetCallStackParent method.
a8e54460 cmState: Store snapshots for more different types.
dbafb015 cmMakefile: Split CallStack into two pieces.
27ff19a9 cmLinkedTree: Add operator* to the iterator.
Diffstat (limited to 'Source/cmMacroCommand.cxx')
| -rw-r--r-- | Source/cmMacroCommand.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 0b945b2..6d3054a 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -97,6 +97,7 @@ bool cmMacroHelperCommand::InvokeInitialPass } cmMakefile::MacroPushPop macroScope(this->Makefile, + this->FilePath, this->Policies); // set the value of argc @@ -131,7 +132,6 @@ bool cmMacroHelperCommand::InvokeInitialPass newLFF.Arguments.clear(); newLFF.Arguments.reserve(this->Functions[c].Arguments.size()); newLFF.Name = this->Functions[c].Name; - newLFF.FilePath = this->Functions[c].FilePath; newLFF.Line = this->Functions[c].Line; // for each argument of the current function |