summaryrefslogtreecommitdiffstats
path: root/Source/cmElseCommand.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2002-08-09 16:00:49 (GMT)
committerKen Martin <ken.martin@kitware.com>2002-08-09 16:00:49 (GMT)
commit6deb5bbe70e6d0498df3fbb319a9b4857410536a (patch)
tree3ff14ac5f23626b0c585dbf7a617e410fb6d8216 /Source/cmElseCommand.cxx
parent67547494dba2bf2f9c45fa60fd0a1a04f3339cb8 (diff)
downloadCMake-6deb5bbe70e6d0498df3fbb319a9b4857410536a.zip
CMake-6deb5bbe70e6d0498df3fbb319a9b4857410536a.tar.gz
CMake-6deb5bbe70e6d0498df3fbb319a9b4857410536a.tar.bz2
better IF ELSE handling
Diffstat (limited to 'Source/cmElseCommand.cxx')
-rw-r--r--Source/cmElseCommand.cxx26
1 files changed, 2 insertions, 24 deletions
diff --git a/Source/cmElseCommand.cxx b/Source/cmElseCommand.cxx
index 2e309dd..661616c 100644
--- a/Source/cmElseCommand.cxx
+++ b/Source/cmElseCommand.cxx
@@ -19,28 +19,6 @@
bool cmElseCommand::InitialPass(std::vector<std::string> const& args)
{
- bool isValid;
- bool isTrue = cmIfCommand::IsTrue(args,isValid,m_Makefile);
-
- if (!isValid)
- {
- this->SetError("An ELSE command had incorrect arguments");
- return false;
- }
-
- // first remove any function blockers for the IF
- m_Makefile->RemoveFunctionBlocker("ELSE",args);
-
- // if is true create a blocker for the else
- cmIfFunctionBlocker *f = new cmIfFunctionBlocker();
- f->m_IsBlocking = isTrue;
- for(std::vector<std::string>::const_iterator j = args.begin();
- j != args.end(); ++j)
- {
- f->m_Args.push_back(*j);
- }
- m_Makefile->AddFunctionBlocker(f);
-
- return true;
+ this->SetError("An ELSE command was found outside of a proper IF ENDIF structure. Or its arguments did not match the opening IF command.");
+ return false;
}
-