summaryrefslogtreecommitdiffstats
path: root/Source/cmUtilitySourceCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-09-11 12:18:15 (GMT)
committerBrad King <brad.king@kitware.com>2009-09-11 12:18:15 (GMT)
commitb41a548d86f8989e790f0150abd3eb337e8c03d0 (patch)
treee22e5e910e1b5769e8bcec6fa20ac703df013e55 /Source/cmUtilitySourceCommand.cxx
parente0df0495e5b313e1f017ebb938c4522db6d5b89c (diff)
downloadCMake-b41a548d86f8989e790f0150abd3eb337e8c03d0.zip
CMake-b41a548d86f8989e790f0150abd3eb337e8c03d0.tar.gz
CMake-b41a548d86f8989e790f0150abd3eb337e8c03d0.tar.bz2
Add parentheses around '&&' between '||' for gcc
The GNU compiler warns about possible operator precedence mistakes and asks for explicit parentheses (-Wparentheses). We add the parentheses to silence the warning. This also fixes one real logic error in the find_package() implementation by correcting expression evaluation order.
Diffstat (limited to 'Source/cmUtilitySourceCommand.cxx')
-rw-r--r--Source/cmUtilitySourceCommand.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx
index f8683ce..929696f 100644
--- a/Source/cmUtilitySourceCommand.cxx
+++ b/Source/cmUtilitySourceCommand.cxx
@@ -56,7 +56,7 @@ bool cmUtilitySourceCommand
{
haveCacheValue = (cacheValue &&
(strstr(cacheValue, "(IntDir)") == 0 ||
- intDir && strcmp(intDir, "$(IntDir)") == 0) &&
+ (intDir && strcmp(intDir, "$(IntDir)") == 0)) &&
(this->Makefile->GetCacheMajorVersion() != 0 &&
this->Makefile->GetCacheMinorVersion() != 0 ));
}