kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: or and and were inverted.

Browse Source
This commit is contained in:
Berk Geveci 2001-08-09 14:58:47 -04:00
parent 6f9a9b6201
commit 78da2d0699
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmElseCommand.cxx
View File

@ -78,7 +78,7 @@ bool cmElseCommand::InitialPass(std::vector<std::string>& args)
{ {
def = m_Makefile->GetDefinition(args[0].c_str()); def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str()); def2 = m_Makefile->GetDefinition(args[2].c_str());
if(cmSystemTools::IsOff(def) || cmSystemTools::IsOff(def2)) if(!cmSystemTools::IsOff(def) && !cmSystemTools::IsOff(def2))
{ {
f = new cmIfFunctionBlocker(); f = new cmIfFunctionBlocker();
} }
@ -88,7 +88,7 @@ bool cmElseCommand::InitialPass(std::vector<std::string>& args)
{ {
def = m_Makefile->GetDefinition(args[0].c_str()); def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str()); def2 = m_Makefile->GetDefinition(args[2].c_str());
if(cmSystemTools::IsOff(def) && cmSystemTools::IsOff(def2)) if(!cmSystemTools::IsOff(def) || !cmSystemTools::IsOff(def2))
{ {
f = new cmIfFunctionBlocker(); f = new cmIfFunctionBlocker();
} }

4
Source/cmIfCommand.cxx
View File

@ -106,7 +106,7 @@ bool cmIfCommand::InitialPass(std::vector<std::string>& args)
{ {
def = m_Makefile->GetDefinition(args[0].c_str()); def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str()); def2 = m_Makefile->GetDefinition(args[2].c_str());
if(!cmSystemTools::IsOff(def) && !cmSystemTools::IsOff(def2)) if(cmSystemTools::IsOff(def) || cmSystemTools::IsOff(def2))
{ {
f = new cmIfFunctionBlocker(); f = new cmIfFunctionBlocker();
} }
@ -116,7 +116,7 @@ bool cmIfCommand::InitialPass(std::vector<std::string>& args)
{ {
def = m_Makefile->GetDefinition(args[0].c_str()); def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str()); def2 = m_Makefile->GetDefinition(args[2].c_str());
if(!cmSystemTools::IsOff(def) || !cmSystemTools::IsOff(def2)) if(cmSystemTools::IsOff(def) && cmSystemTools::IsOff(def2))
{ {
f = new cmIfFunctionBlocker(); f = new cmIfFunctionBlocker();
} }