Commit edac95b9 authored by Gregor Jasny's avatar Gregor Jasny Committed by Brad King

cmIfCommand: Reject duplicate else() and misplaced elseif()

Closes: #14335
parent 3be5896e
......@@ -57,8 +57,19 @@ bool cmIfFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
// watch for our state change
if (scopeDepth == 0 &&
!cmSystemTools::Strucmp(this->Functions[c].Name.c_str(), "else")) {
if (this->ElseSeen) {
cmListFileBacktrace bt = mf.GetBacktrace(this->Functions[c]);
mf.GetCMakeInstance()->IssueMessage(
cmake::FATAL_ERROR,
"A duplicate ELSE command was found inside an IF block.", bt);
cmSystemTools::SetFatalErrorOccured();
return true;
}
this->IsBlocking = this->HasRun;
this->HasRun = true;
this->ElseSeen = true;
// if trace is enabled, print a (trivially) evaluated "else"
// statement
......@@ -68,6 +79,15 @@ bool cmIfFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
} else if (scopeDepth == 0 &&
!cmSystemTools::Strucmp(this->Functions[c].Name.c_str(),
"elseif")) {
if (this->ElseSeen) {
cmListFileBacktrace bt = mf.GetBacktrace(this->Functions[c]);
mf.GetCMakeInstance()->IssueMessage(
cmake::FATAL_ERROR,
"An ELSEIF command was found after an ELSE command.", bt);
cmSystemTools::SetFatalErrorOccured();
return true;
}
if (this->HasRun) {
this->IsBlocking = true;
} else {
......
......@@ -21,6 +21,7 @@ public:
cmIfFunctionBlocker()
{
this->HasRun = false;
this->ElseSeen = false;
this->ScopeDepth = 0;
}
~cmIfFunctionBlocker() CM_OVERRIDE {}
......@@ -32,6 +33,7 @@ public:
std::vector<cmListFileFunction> Functions;
bool IsBlocking;
bool HasRun;
bool ElseSeen;
unsigned int ScopeDepth;
};
......
......@@ -3,7 +3,11 @@ include(RunCMake)
run_cmake(InvalidArgument1)
run_cmake(IsDirectory)
run_cmake(IsDirectoryLong)
run_cmake(duplicate-deep-else)
run_cmake(duplicate-else)
run_cmake(duplicate-else-after-elseif)
run_cmake(elseif-message)
run_cmake(misplaced-elseif)
run_cmake(MatchesSelf)
......
CMake Error at duplicate-deep-else.cmake:[0-9]+ \(else\):
A duplicate ELSE command was found inside an IF block.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
if(0)
else()
if(0)
else()
else()
endif()
endif()
CMake Error at duplicate-else-after-elseif.cmake:[0-9]+ \(else\):
A duplicate ELSE command was found inside an IF block.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
if(0)
elseif(0)
else()
else()
endif()
CMake Error at duplicate-else.cmake:[0-9]+ \(else\):
A duplicate ELSE command was found inside an IF block.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
if(0)
else()
else()
endif()
CMake Error at misplaced-elseif.cmake:[0-9]+ \(elseif\):
An ELSEIF command was found after an ELSE command.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
if(0)
else()
elseif(1)
endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment