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

STYLE: fix line length stuff for KWStyle

This commit is contained in:
Bill Hoffman 2008-10-01 09:04:27 -04:00
parent 8a704d5686
commit ecf312ccc8
15 changed files with 112 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/CPack/cmCPackBundleGenerator.cxx
View File

@ -80,7 +80,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName,
(void) files;
// Get required arguments ...
const std::string cpack_bundle_name = this->GetOption("CPACK_BUNDLE_NAME") ? this->GetOption("CPACK_BUNDLE_NAME") : "";
const std::string cpack_bundle_name = this->GetOption("CPACK_BUNDLE_NAME")
? this->GetOption("CPACK_BUNDLE_NAME") : "";
if(cpack_bundle_name.empty())
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@ -90,7 +91,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName,
return 0;
}
const std::string cpack_bundle_plist = this->GetOption("CPACK_BUNDLE_PLIST") ? this->GetOption("CPACK_BUNDLE_PLIST") : "";
const std::string cpack_bundle_plist = this->GetOption("CPACK_BUNDLE_PLIST")
? this->GetOption("CPACK_BUNDLE_PLIST") : "";
if(cpack_bundle_plist.empty())
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@ -100,7 +102,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName,
return 0;
}
const std::string cpack_bundle_icon = this->GetOption("CPACK_BUNDLE_ICON") ? this->GetOption("CPACK_BUNDLE_ICON") : "";
const std::string cpack_bundle_icon = this->GetOption("CPACK_BUNDLE_ICON")
? this->GetOption("CPACK_BUNDLE_ICON") : "";
if(cpack_bundle_icon.empty())
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@ -110,7 +113,9 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName,
return 0;
}
const std::string cpack_bundle_startup_command = this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") ? this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") : "";
const std::string cpack_bundle_startup_command =
this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") ?
this->GetOption("CPACK_BUNDLE_STARTUP_COMMAND") : "";
if(cpack_bundle_startup_command.empty())
{
cmCPackLogger(cmCPackLog::LOG_ERROR,
@ -121,7 +126,8 @@ int cmCPackBundleGenerator::CompressFiles(const char* outFileName,
}
// Get optional arguments ...
const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON") ? this->GetOption("CPACK_PACKAGE_ICON") : "";
const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON")
? this->GetOption("CPACK_PACKAGE_ICON") : "";
// The staging directory contains everything that will end-up inside the
// final disk image ...

25
Source/CPack/cmCPackGenerator.cxx
View File

@ -661,9 +661,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
return 0;
}
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"- Using DESTDIR + CPACK_INSTALL_PREFIX... (mf->AddDefinition)"
<< std::endl);
cmCPackLogger(
cmCPackLog::LOG_DEBUG,
"- Using DESTDIR + CPACK_INSTALL_PREFIX... (mf->AddDefinition)"
<< std::endl);
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"- Setting CMAKE_INSTALL_PREFIX to '" << dir << "'"
<< std::endl);
@ -681,9 +682,11 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
}
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"- Using non-DESTDIR install... (mf->AddDefinition)" << std::endl);
"- Using non-DESTDIR install... (mf->AddDefinition)"
<< std::endl);
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"- Setting CMAKE_INSTALL_PREFIX to '" << tempInstallDirectory
"- Setting CMAKE_INSTALL_PREFIX to '"
<< tempInstallDirectory
<< "'" << std::endl);
}
@ -770,7 +773,8 @@ int cmCPackGenerator::DoPackage()
= this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
if ( cmSystemTools::FileExists(toplevelDirectory) )
{
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Remove toplevel directory: "
cmCPackLogger(cmCPackLog::LOG_VERBOSE,
"Remove toplevel directory: "
<< toplevelDirectory << std::endl);
if ( !cmSystemTools::RemoveADirectory(toplevelDirectory) )
{
@ -1077,7 +1081,8 @@ bool cmCPackGenerator::SupportsComponentInstallation() const
//----------------------------------------------------------------------
cmCPackInstallationType*
cmCPackGenerator::GetInstallationType(const char *projectName, const char *name)
cmCPackGenerator::GetInstallationType(const char *projectName,
const char *name)
{
(void) projectName;
bool hasInstallationType = this->InstallationTypes.count(name) != 0;
@ -1138,7 +1143,8 @@ cmCPackGenerator::GetComponent(const char *projectName, const char *name)
= this->IsSet((macroPrefix + "_DOWNLOADED").c_str())
|| cmSystemTools::IsOn(this->GetOption("CPACK_DOWNLOAD_ALL"));
const char* archiveFile = this->GetOption((macroPrefix + "_ARCHIVE_FILE").c_str());
const char* archiveFile = this->GetOption((macroPrefix +
"_ARCHIVE_FILE").c_str());
if (archiveFile && *archiveFile)
{
component->ArchiveFile = archiveFile;
@ -1190,7 +1196,8 @@ cmCPackGenerator::GetComponent(const char *projectName, const char *name)
dependIt != dependsVector.end();
++dependIt)
{
cmCPackComponent *child = GetComponent(projectName, dependIt->c_str());
cmCPackComponent *child = GetComponent(projectName,
dependIt->c_str());
component->Dependencies.push_back(child);
child->ReverseDependencies.push_back(component);
}

9
Source/CPack/cmCPackGenerator.h
View File

@ -127,9 +127,12 @@ protected:
bool setDestDir, const char* tempInstallDirectory);
virtual bool SupportsComponentInstallation() const;
virtual cmCPackInstallationType* GetInstallationType(const char *projectName, const char* name);
virtual cmCPackComponent* GetComponent(const char *projectName, const char* name);
virtual cmCPackComponentGroup* GetComponentGroup(const char *projectName, const char* name);
virtual cmCPackInstallationType* GetInstallationType(const char *projectName,
const char* name);
virtual cmCPackComponent* GetComponent(const char *projectName,
const char* name);
virtual cmCPackComponentGroup* GetComponentGroup(const char *projectName,
const char* name);
bool GeneratorVerbose;
std::string Name;

33
Source/CPack/cmCPackNSISGenerator.cxx
View File

@ -111,7 +111,8 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName,
std::string::size_type slash = fileN.find('/');
if (slash != std::string::npos)
{
// If this is a component installation, determine which component it is.
// If this is a component installation, determine which component it
// is.
componentName = fileN.substr(0, slash);
// Strip off the component part of the path.
@ -284,12 +285,17 @@ int cmCPackNSISGenerator::CompressFiles(const char* outFileName,
}
}
this->SetOptionIfNotSet("CPACK_NSIS_INSTALLATION_TYPES", installTypesCode.c_str());
this->SetOptionIfNotSet("CPACK_NSIS_PAGE_COMPONENTS", "!insertmacro MUI_PAGE_COMPONENTS");
this->SetOptionIfNotSet("CPACK_NSIS_INSTALLATION_TYPES",
installTypesCode.c_str());
this->SetOptionIfNotSet("CPACK_NSIS_PAGE_COMPONENTS",
"!insertmacro MUI_PAGE_COMPONENTS");
this->SetOptionIfNotSet("CPACK_NSIS_FULL_INSTALL", "");
this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTIONS", componentCode.c_str());
this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTION_LIST", sectionList.c_str());
this->SetOptionIfNotSet("CPACK_NSIS_SECTION_SELECTED_VARS", selectedVarsList.c_str());
this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTIONS",
componentCode.c_str());
this->SetOptionIfNotSet("CPACK_NSIS_COMPONENT_SECTION_LIST",
sectionList.c_str());
this->SetOptionIfNotSet("CPACK_NSIS_SECTION_SELECTED_VARS",
selectedVarsList.c_str());
this->SetOption("CPACK_NSIS_DEFINES", defines.c_str());
}
@ -590,7 +596,8 @@ bool cmCPackNSISGenerator::SupportsComponentInstallation() const
//----------------------------------------------------------------------
std::string
cmCPackNSISGenerator::
CreateComponentDescription(cmCPackComponent *component, cmOStringStream& macrosOut)
CreateComponentDescription(cmCPackComponent *component,
cmOStringStream& macrosOut)
{
// Basic description of the component
std::string componentCode = "Section ";
@ -640,7 +647,8 @@ CreateComponentDescription(cmCPackComponent *component, cmOStringStream& macrosO
}
// Create the directory for the upload area
const char* userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY");
const char* userUploadDirectory =
this->GetOption("CPACK_UPLOAD_DIRECTORY");
std::string uploadDirectory;
if (userUploadDirectory && *userUploadDirectory)
{
@ -770,7 +778,8 @@ CreateComponentDescription(cmCPackComponent *component, cmOStringStream& macrosO
}
else
{
componentCode += " File /r \"${INST_DIR}\\" + component->Name + "\\*.*\"\n";
componentCode += " File /r \"${INST_DIR}\\" +
component->Name + "\\*.*\"\n";
}
componentCode += " noinstall_" + component->Name + ":\n";
componentCode += "SectionEnd\n";
@ -837,7 +846,8 @@ std::string cmCPackNSISGenerator::CreateSelectionDependenciesDescription
out << " SectionGetFlags ${" << (*dependIt)->Name << "} $0\n";
out << " IntOp $0 $0 | ${SF_SELECTED}\n";
out << " SectionSetFlags ${" << (*dependIt)->Name << "} $0\n";
out << " IntOp $" << (*dependIt)->Name << "_selected 0 + ${SF_SELECTED}\n";
out << " IntOp $" << (*dependIt)->Name
<< "_selected 0 + ${SF_SELECTED}\n";
// Recurse
out << CreateSelectionDependenciesDescription(*dependIt, visited).c_str();
}
@ -872,7 +882,8 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription
out << " IntOp $" << (*dependIt)->Name << "_selected 0 + 0\n";
// Recurse
out << CreateDeselectionDependenciesDescription(*dependIt, visited).c_str();
out <<
CreateDeselectionDependenciesDescription(*dependIt, visited).c_str();
}
return out.str();

4
Source/CPack/cmCPackNSISGenerator.h
View File

@ -65,8 +65,8 @@ protected:
(cmCPackComponent *component,
std::set<cmCPackComponent *>& visited);
/// Produce NSIS code that de-selects all of the components that are dependent
/// on this component, recursively.
/// Produce NSIS code that de-selects all of the components that are
/// dependent on this component, recursively.
std::string CreateDeselectionDependenciesDescription
(cmCPackComponent *component,
std::set<cmCPackComponent *>& visited);

31
Source/CPack/cmCPackPackageMakerGenerator.cxx
View File

@ -179,7 +179,8 @@ int cmCPackPackageMakerGenerator::CompressFiles(const char* outFileName,
// Create the directory where downloaded component packages will
// be placed.
const char* userUploadDirectory = this->GetOption("CPACK_UPLOAD_DIRECTORY");
const char* userUploadDirectory =
this->GetOption("CPACK_UPLOAD_DIRECTORY");
std::string uploadDirectory;
if (userUploadDirectory && *userUploadDirectory)
{
@ -222,15 +223,20 @@ int cmCPackPackageMakerGenerator::CompressFiles(const char* outFileName,
{
if (this->PackageCompatibilityVersion < 10.5)
{
cmCPackLogger(cmCPackLog::LOG_WARNING,
"CPack warning: please set CPACK_OSX_PACKAGE_VERSION to 10.5 or greater enable downloaded packages. CPack will build a non-downloaded package."
<< std::endl);
cmCPackLogger(
cmCPackLog::LOG_WARNING,
"CPack warning: please set CPACK_OSX_PACKAGE_VERSION to 10.5 "
"or greater enable downloaded packages. CPack will build a "
"non-downloaded package."
<< std::endl);
}
if (this->PackageMakerVersion < 3)
{
cmCPackLogger(cmCPackLog::LOG_WARNING,
"CPack warning: unable to build downloaded packages with PackageMaker versions prior to 3.0. CPack will build a non-downloaded package."
"CPack warning: unable to build downloaded "
"packages with PackageMaker versions prior "
"to 3.0. CPack will build a non-downloaded package."
<< std::endl);
}
@ -605,7 +611,8 @@ GenerateComponentPackage(const char *packageFile,
const cmCPackComponent& component)
{
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Building component package: " << packageFile << std::endl);
"- Building component package: " <<
packageFile << std::endl);
// The command that will be used to run PackageMaker
cmOStringStream pkgCmd;
@ -638,7 +645,8 @@ GenerateComponentPackage(const char *packageFile,
// Create the Info.plist file for this component
std::string moduleVersionSuffix = ".";
moduleVersionSuffix += component.Name;
this->SetOption("CPACK_MODULE_VERSION_SUFFIX", moduleVersionSuffix.c_str());
this->SetOption("CPACK_MODULE_VERSION_SUFFIX",
moduleVersionSuffix.c_str());
std::string infoFileName = component.Name;
infoFileName += "-Info.plist";
if (!this->CopyResourcePlistFile("Info.plist", infoFileName.c_str()))
@ -801,7 +809,8 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component,
out << "<choice id=\"" << component.Name << "Choice\" "
<< "title=\"" << component.DisplayName << "\" "
<< "start_selected=\""
<< (component.IsDisabledByDefault && !component.IsRequired? "false" : "true")
<< (component.IsDisabledByDefault &&
!component.IsRequired? "false" : "true")
<< "\" "
<< "start_enabled=\""
<< (component.IsRequired? "false" : "true")
@ -812,7 +821,8 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component,
out << "description=\"" << EscapeForXML(component.Description)
<< "\" ";
}
if (!component.Dependencies.empty() || !component.ReverseDependencies.empty())
if (!component.Dependencies.empty() ||
!component.ReverseDependencies.empty())
{
// The "selected" expression is evaluated each time any choice is
// selected, for all choices *except* the one that the user
@ -885,7 +895,8 @@ AddDependencyAttributes(const cmCPackComponent& component,
dependIt != component.Dependencies.end();
++dependIt)
{
out << " &amp;&amp; choices['" << (*dependIt)->Name << "Choice'].selected";
out << " &amp;&amp; choices['" <<
(*dependIt)->Name << "Choice'].selected";
AddDependencyAttributes(**dependIt, visited, out);
}
}

9
Source/CTest/cmCTestTestHandler.cxx
View File

@ -577,8 +577,10 @@ int cmCTestTestHandler::ProcessHandler()
{
ofs << ftit->TestCount << ":" << ftit->Name << std::endl;
cmCTestLog(this->CTest, HANDLER_OUTPUT, "\t" << std::setw(3)
<< ftit->TestCount << " - " << ftit->Name.c_str() << " ("
<< this->GetTestStatus(ftit->Status) << ")" << std::endl);
<< ftit->TestCount << " - "
<< ftit->Name.c_str() << " ("
<< this->GetTestStatus(ftit->Status) << ")"
<< std::endl);
}
}
@ -1575,7 +1577,8 @@ std::string cmCTestTestHandler
attemptedConfigs,
filepath,filename);
// even if a fullpath was specified also try it relative to the current directory
// even if a fullpath was specified also try it relative to the current
// directory
if (filepath.size() && filepath[0] == '/')
{
std::string localfilepath = filepath.substr(1,filepath.size()-1);

3
Source/cmCTest.cxx
View File

@ -1654,7 +1654,8 @@ void cmCTest::HandleCommandLineArguments(size_t &i,
int plevel = atoi(arg.substr(2).c_str());
this->SetParallelLevel(plevel);
}
if(this->CheckArgument(arg, "--internal-ctest-parallel") && i < args.size() - 1)
if(this->CheckArgument(arg, "--internal-ctest-parallel")
&& i < args.size() - 1)
{
i++;
int pid = atoi(args[i].c_str());

3
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -155,7 +155,8 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
{
// check to see if this is a fortran build
const char* ext = ".vcproj";
const char* project = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
const char* project =
"Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(t))
{
ext = ".vfproj";

3
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -486,7 +486,8 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
{
// check to see if this is a fortran build
const char* ext = ".vcproj";
const char* project = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
const char* project =
"Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(target))
{
ext = ".vfproj";

3
Source/cmIfCommand.cxx
View File

@ -360,7 +360,8 @@ namespace
newArgs2.push_back(*argP1);
}
newArgs2.pop_back();
// now recursively invoke IsTrue to handle the values inside the parenthetical expression
// now recursively invoke IsTrue to handle the values inside the
// parenthetical expression
bool value =
cmIfCommand::IsTrue(newArgs2, errorString, makefile);
if(value)

27
Source/cmInstallCommand.cxx
View File

@ -607,8 +607,6 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
break;
}
// if(target.GetProperty("ASSOCIATED_FILES");
// These well-known sets of files are installed *automatically* for FRAMEWORK
// SHARED library targets on the Mac as part of installing the FRAMEWORK.
// For other target types or on other platforms, they are not installed
@ -708,7 +706,8 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
installsRuntime = installsRuntime || runtimeGenerator != 0;
installsFramework = installsFramework || frameworkGenerator != 0;
installsBundle = installsBundle || bundleGenerator != 0;
installsPrivateHeader = installsPrivateHeader || privateHeaderGenerator != 0;
installsPrivateHeader = installsPrivateHeader
|| privateHeaderGenerator != 0;
installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0;
installsResource = installsResource || resourceGenerator;
@ -733,46 +732,48 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
}
}
// Tell the global generator about any installation component names specified
// Tell the global generator about any installation component names
// specified
if (installsArchive)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(archiveArgs.GetComponent().c_str());
this->Makefile->GetLocalGenerator()->
GetGlobalGenerator()
->AddInstallComponent(archiveArgs.GetComponent().c_str());
}
if (installsLibrary)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(libraryArgs.GetComponent().c_str());
->AddInstallComponent(libraryArgs.GetComponent().c_str());
}
if (installsRuntime)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(runtimeArgs.GetComponent().c_str());
->AddInstallComponent(runtimeArgs.GetComponent().c_str());
}
if (installsFramework)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(frameworkArgs.GetComponent().c_str());
->AddInstallComponent(frameworkArgs.GetComponent().c_str());
}
if (installsBundle)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(bundleArgs.GetComponent().c_str());
->AddInstallComponent(bundleArgs.GetComponent().c_str());
}
if (installsPrivateHeader)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(privateHeaderArgs.GetComponent().c_str());
->AddInstallComponent(privateHeaderArgs.GetComponent().c_str());
}
if (installsPublicHeader)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(publicHeaderArgs.GetComponent().c_str());
->AddInstallComponent(publicHeaderArgs.GetComponent().c_str());
}
if (installsResource)
{
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
->AddInstallComponent(resourceArgs.GetComponent().c_str());
->AddInstallComponent(resourceArgs.GetComponent().c_str());
}
return true;

3
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -702,7 +702,8 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
modDir = ".";
}
fout << "\t\t\t\tModulePath=\""
<< this->ConvertToXMLOutputPath(modDir.c_str()) << "\\$(ConfigurationName)\"\n";
<< this->ConvertToXMLOutputPath(modDir.c_str())
<< "\\$(ConfigurationName)\"\n";
}
targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
fout << "\t\t\t\tAdditionalIncludeDirectories=\"";

3
Source/cmMakefile.cxx
View File

@ -83,7 +83,8 @@ cmMakefile::cmMakefile()
this->AddSourceGroup("", "^.*$");
this->AddSourceGroup
("Source Files",
"\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$");
"\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp"
"|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$");
this->AddSourceGroup("Header Files",
"\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$");
this->AddSourceGroup("CMake Rules", "\\.rule$");

3
Source/cmake.cxx
View File

@ -3970,7 +3970,8 @@ int cmake::VisualStudioLink(std::vector<std::string>& args, int type)
std::cout << "Visual Studio Incremental Link without manifests\n";
}
}
return cmake::VisualStudioLinkNonIncremental(expandedArgs, type, hasManifest, verbose);
return cmake::VisualStudioLinkNonIncremental(expandedArgs,
type, hasManifest, verbose);
}
int cmake::ParseVisualStudioLinkCommand(std::vector<std::string>& args,