Browse Source

BUG: or and and were inverted.

Berk Geveci 24 years ago
parent
commit
78da2d0699
2 changed files with 4 additions and 4 deletions
  1. 2 2
      Source/cmElseCommand.cxx
  2. 2 2
      Source/cmIfCommand.cxx

+ 2 - 2
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();
       }

+ 2 - 2
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();
       }