diff options
| author | Brad King <brad.king@kitware.com> | 2009-09-11 12:18:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-09-11 12:18:15 (GMT) |
| commit | b41a548d86f8989e790f0150abd3eb337e8c03d0 (patch) | |
| tree | e22e5e910e1b5769e8bcec6fa20ac703df013e55 /Source/CPack | |
| parent | e0df0495e5b313e1f017ebb938c4522db6d5b89c (diff) | |
| download | CMake-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/CPack')
| -rw-r--r-- | Source/CPack/cpack.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 51001aa..2782dca 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -359,10 +359,11 @@ int main (int argc, char *argv[]) "CPack project name not specified" << std::endl); parsed = 0; } - if ( parsed && !(mf->GetDefinition("CPACK_PACKAGE_VERSION") - || mf->GetDefinition("CPACK_PACKAGE_VERSION_MAJOR") && - mf->GetDefinition("CPACK_PACKAGE_VERSION_MINOR") - && mf->GetDefinition("CPACK_PACKAGE_VERSION_PATCH")) ) + if (parsed && + !(mf->GetDefinition("CPACK_PACKAGE_VERSION") || + (mf->GetDefinition("CPACK_PACKAGE_VERSION_MAJOR") && + mf->GetDefinition("CPACK_PACKAGE_VERSION_MINOR") && + mf->GetDefinition("CPACK_PACKAGE_VERSION_PATCH")))) { cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "CPack project version not specified" << std::endl |