kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix KWStyle warnings

This commit is contained in:
Eric NOULARD 2011-04-01 19:21:51 +02:00 committed by Brad King
parent 64a5e20999
commit 9c43824066
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CPack/cmCPackArchiveGenerator.cxx
View File

@ -254,7 +254,8 @@ int cmCPackArchiveGenerator::PackageFiles()
// in this case you'll get 1 package for each component. // in this case you'll get 1 package for each component.
else else
{ {
return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT); return PackageComponents(componentPackageMethod ==
ONE_PACKAGE_PER_COMPONENT);
} }
} }

3
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -250,7 +250,8 @@ int cmCPackDebGenerator::PackageFiles()
// in this case you'll get 1 package for each component. // in this case you'll get 1 package for each component.
else else
{ {
return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT); return PackageComponents(componentPackageMethod ==
ONE_PACKAGE_PER_COMPONENT);
} }
} }
// CASE 3 : NON COMPONENT package. // CASE 3 : NON COMPONENT package.

19
Source/CPack/cmCPackGenerator.cxx
View File

@ -1307,10 +1307,10 @@ int cmCPackGenerator::PrepareGroupingKind()
else else
{ {
cmCPackLogger(cmCPackLog::LOG_WARNING, "[" cmCPackLogger(cmCPackLog::LOG_WARNING, "["
<< this->Name << "]" << this->Name << "]"
<< " requested component grouping type <"<< groupingType << " requested component grouping type <"<< groupingType
<< "> UNKNOWN not in (ALL_COMPONENTS_IN_ONE,IGNORE,ONE_PER_GROUP)" << "> UNKNOWN not in (ALL_COMPONENTS_IN_ONE,IGNORE,ONE_PER_GROUP)"
<< std::endl); << std::endl);
} }
} }
@ -1328,10 +1328,10 @@ int cmCPackGenerator::PrepareGroupingKind()
method = ONE_PACKAGE_PER_COMPONENT; method = ONE_PACKAGE_PER_COMPONENT;
} }
cmCPackLogger(cmCPackLog::LOG_WARNING, "[" cmCPackLogger(cmCPackLog::LOG_WARNING, "["
<< this->Name << "]" << this->Name << "]"
<< " One package per component group requested, but NO component groups exist:" << " One package per component group requested, "
<< " Ignoring component group." << "but NO component groups exist: Ignoring component group."
<< std::endl); << std::endl);
} }
// if user specified packaging method, override the default packaging method // if user specified packaging method, override the default packaging method
@ -1349,7 +1349,8 @@ int cmCPackGenerator::PrepareGroupingKind()
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "[" cmCPackLogger(cmCPackLog::LOG_VERBOSE, "["
<< this->Name << "]" << this->Name << "]"
<< " requested component grouping = " << method_names[componentPackageMethod] << " requested component grouping = "
<< method_names[componentPackageMethod]
<< std::endl); << std::endl);
return 1; return 1;

6
Source/CPack/cmCPackGenerator.h
View File

@ -248,14 +248,16 @@ protected:
ONE_PACKAGE, ONE_PACKAGE,
/* one package for each component */ /* one package for each component */
ONE_PACKAGE_PER_COMPONENT, ONE_PACKAGE_PER_COMPONENT,
/* one package for each group, with left over components in their own package */ /* one package for each group,
* with left over components in their own package */
ONE_PACKAGE_PER_GROUP, ONE_PACKAGE_PER_GROUP,
UNKNOWN_COMPONENT_PACKAGE_METHOD UNKNOWN_COMPONENT_PACKAGE_METHOD
}; };
/** /**
* The component package method * The component package method
* The default is ONE_PACKAGE_PER_GROUP, and generators may override the default * The default is ONE_PACKAGE_PER_GROUP,
* and generators may override the default
* before PrepareGroupingKind() is called. * before PrepareGroupingKind() is called.
*/ */
ComponentPackageMethod componentPackageMethod; ComponentPackageMethod componentPackageMethod;

3
Source/CPack/cmCPackRPMGenerator.cxx
View File

@ -215,7 +215,8 @@ int cmCPackRPMGenerator::PackageFiles()
// in this case you'll get 1 package for each component. // in this case you'll get 1 package for each component.
else else
{ {
return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT); return PackageComponents(componentPackageMethod ==
ONE_PACKAGE_PER_COMPONENT);
} }
} }
// CASE 3 : NON COMPONENT package. // CASE 3 : NON COMPONENT package.