diff options
| -rw-r--r-- | Source/cmElseCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmIfCommand.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmElseCommand.cxx b/Source/cmElseCommand.cxx index 4aca32a..2117c39 100644 --- a/Source/cmElseCommand.cxx +++ b/Source/cmElseCommand.cxx @@ -78,7 +78,7 @@ bool cmElseCommand::InitialPass(std::vector<std::string>& args) { def = m_Makefile->GetDefinition(args[0].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(); } @@ -88,7 +88,7 @@ bool cmElseCommand::InitialPass(std::vector<std::string>& args) { def = m_Makefile->GetDefinition(args[0].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(); } diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 0599e8f..9a0fc01 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -106,7 +106,7 @@ bool cmIfCommand::InitialPass(std::vector<std::string>& args) { def = m_Makefile->GetDefinition(args[0].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(); } @@ -116,7 +116,7 @@ bool cmIfCommand::InitialPass(std::vector<std::string>& args) { def = m_Makefile->GetDefinition(args[0].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(); } |