diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-20 17:13:52 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-20 21:40:12 (GMT) |
| commit | d6a03b475e023da9b7532a5b8735caec36b5de86 (patch) | |
| tree | 5a7fce28bcc989ae6a841118b2031f162ae3b705 /Source/cmMakefile.h | |
| parent | 22bfb39dea2476df8f7aa5ed5c773a7a6720c4bc (diff) | |
| download | CMake-d6a03b475e023da9b7532a5b8735caec36b5de86.zip CMake-d6a03b475e023da9b7532a5b8735caec36b5de86.tar.gz CMake-d6a03b475e023da9b7532a5b8735caec36b5de86.tar.bz2 | |
cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)
Commit v3.4.0-rc1~494^2~4 (cmMakefile: Add API for elseif to create
backtrace., 2015-05-29) removed the use of cmMakefileCall to push/pop
execution context in favor of a new way to create backtraces.
However, a call to cmMakefile::GetExecutionContext is still invoked to
issue a contextual CMP0054 warning through cmConditionEvaluator. As
the elseif is not part of the call stack, this resulted in trying to
access an empty vector.
Avoid the attempt at getting execution context when evaluating elseif by
constructing a context and backtrace on behalf of the cmConditionEvaluator
in all cases.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 8724c6e..111f074 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -336,7 +336,7 @@ public: * Determine if the given context, name pair has already been reported * in context of CMP0054. */ - bool HasCMP0054AlreadyBeenReported() const; + bool HasCMP0054AlreadyBeenReported(const cmListFileContext &context) const; bool IgnoreErrorsCMP0061() const; |