[Cmake-commits] [cmake-commits] king committed cpack.cxx 1.46 1.47

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv1018/Source/CPack

Modified Files:
	cpack.cxx 
Log Message:
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.


Index: cpack.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cpack.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -C 2 -d -r1.46 -r1.47
*** cpack.cxx	22 Jan 2009 18:56:13 -0000	1.46
--- cpack.cxx	11 Sep 2009 12:17:52 -0000	1.47
***************
*** 360,367 ****
            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")) )
            {
            cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
--- 360,368 ----
            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"))))
            {
            cmCPack_Log(&log, cmCPackLog::LOG_ERROR,