summaryrefslogtreecommitdiffstats
path: root/Source/cmIfCommand.cxx
diff options
context:
space:
mode:
authorBerk Geveci <berk.geveci@kitware.com>2001-08-09 18:58:47 (GMT)
committerBerk Geveci <berk.geveci@kitware.com>2001-08-09 18:58:47 (GMT)
commit78da2d06992d9e49cab3c43147452ccdd30aeeee (patch)
tree33670cad3429fcd6e3a37cb301372cfaa24dd744 /Source/cmIfCommand.cxx
parent6f9a9b6201726eab94db0ac33b8b9146927811f3 (diff)
downloadCMake-78da2d06992d9e49cab3c43147452ccdd30aeeee.zip
CMake-78da2d06992d9e49cab3c43147452ccdd30aeeee.tar.gz
CMake-78da2d06992d9e49cab3c43147452ccdd30aeeee.tar.bz2
BUG: or and and were inverted.
Diffstat (limited to 'Source/cmIfCommand.cxx')
-rw-r--r--Source/cmIfCommand.cxx4
1 files changed, 2 insertions, 2 deletions
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();
}