diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-06 18:30:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-09 13:41:43 (GMT) |
| commit | 0ac18d40c8c29a17f1acfcaca506f41a26185901 (patch) | |
| tree | 88b5d3c4b8c587d7979231d0e6ce9b03b0685a74 /Source | |
| parent | d95fbdb70944a8f9a7e6ac11bc51f410a99aafcd (diff) | |
| download | CMake-0ac18d40c8c29a17f1acfcaca506f41a26185901.zip CMake-0ac18d40c8c29a17f1acfcaca506f41a26185901.tar.gz CMake-0ac18d40c8c29a17f1acfcaca506f41a26185901.tar.bz2 | |
Remove `//------...` horizontal separator comments
Modern editors provide plenty of ways to visually separate functions.
Drop the explicit comments that previously served this purpose.
Use the following command to automate the change:
$ git ls-files -z -- \
"*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" |
egrep -z -v "^Source/cmCommandArgumentLexer\." |
egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmDependsJavaLexer\." |
egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmExprLexer\." |
egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmFortranLexer\." |
egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" |
egrep -z -v "^Source/cmListFileLexer\." |
egrep -z -v "^Source/cm_sha2" |
egrep -z -v "^Source/(kwsys|CursesDialog/form)/" |
egrep -z -v "^Utilities/(KW|cm).*/" |
xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}'
This avoids modifying third-party sources and generated sources.
Diffstat (limited to 'Source')
217 files changed, 0 insertions, 2623 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index c10803c..cf8587c 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -31,38 +31,32 @@ #include <cmVersionConfig.h> #include <cmXMLWriter.h> -//---------------------------------------------------------------------------- cmCPackIFWGenerator::cmCPackIFWGenerator() { } -//---------------------------------------------------------------------------- cmCPackIFWGenerator::~cmCPackIFWGenerator() { } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsVersionLess(const char *version) { return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS, FrameworkVersion.data(), version); } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsVersionGreater(const char *version) { return cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER, FrameworkVersion.data(), version); } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsVersionEqual(const char *version) { return cmSystemTools::VersionCompare(cmSystemTools::OP_EQUAL, FrameworkVersion.data(), version); } -//---------------------------------------------------------------------------- int cmCPackIFWGenerator::PackageFiles() { cmCPackLogger(cmCPackLog::LOG_OUTPUT, "- Configuration" << std::endl); @@ -223,7 +217,6 @@ int cmCPackIFWGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------------- const char *cmCPackIFWGenerator::GetPackagingInstallPrefix() { const char *defPrefix = cmCPackGenerator::GetPackagingInstallPrefix(); @@ -240,13 +233,11 @@ const char *cmCPackIFWGenerator::GetPackagingInstallPrefix() return this->GetOption("CPACK_IFW_PACKAGING_INSTALL_PREFIX"); } -//---------------------------------------------------------------------------- const char *cmCPackIFWGenerator::GetOutputExtension() { return ExecutableSuffix.c_str(); } -//---------------------------------------------------------------------------- int cmCPackIFWGenerator::InitializeInternal() { // Search Qt Installer Framework tools @@ -367,7 +358,6 @@ int cmCPackIFWGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetComponentInstallDirNameSuffix( const std::string& componentName) @@ -384,7 +374,6 @@ cmCPackIFWGenerator::GetComponentInstallDirNameSuffix( + suffix; } -//---------------------------------------------------------------------------- cmCPackComponent* cmCPackIFWGenerator::GetComponent(const std::string &projectName, const std::string &componentName) @@ -433,7 +422,6 @@ cmCPackIFWGenerator::GetComponent(const std::string &projectName, return component; } -//---------------------------------------------------------------------------- cmCPackComponentGroup* cmCPackIFWGenerator::GetComponentGroup(const std::string &projectName, const std::string &groupName) @@ -471,32 +459,27 @@ cmCPackIFWGenerator::GetComponentGroup(const std::string &projectName, return group; } -//---------------------------------------------------------------------------- enum cmCPackGenerator::CPackSetDestdirSupport cmCPackIFWGenerator::SupportsSetDestdir() const { return cmCPackGenerator::SETDESTDIR_SHOULD_NOT_BE_USED; } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::SupportsAbsoluteDestination() const { return false; } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::SupportsComponentInstallation() const { return true; } -//---------------------------------------------------------------------------- bool cmCPackIFWGenerator::IsOnePackage() const { return componentPackageMethod == ONE_PACKAGE; } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetRootPackageName() { // Default value @@ -525,7 +508,6 @@ std::string cmCPackIFWGenerator::GetRootPackageName() return name; } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetGroupPackageName(cmCPackComponentGroup *group) const { @@ -556,7 +538,6 @@ cmCPackIFWGenerator::GetGroupPackageName(cmCPackComponentGroup *group) const return name; } -//---------------------------------------------------------------------------- std::string cmCPackIFWGenerator::GetComponentPackageName( cmCPackComponent *component) const { @@ -592,7 +573,6 @@ std::string cmCPackIFWGenerator::GetComponentPackageName( return name; } -//---------------------------------------------------------------------------- cmCPackIFWPackage* cmCPackIFWGenerator::GetGroupPackage( cmCPackComponentGroup *group) const { @@ -601,7 +581,6 @@ cmCPackIFWPackage* cmCPackIFWGenerator::GetGroupPackage( return pit != GroupPackages.end() ? pit->second : 0; } -//---------------------------------------------------------------------------- cmCPackIFWPackage* cmCPackIFWGenerator::GetComponentPackage( cmCPackComponent *component) const { @@ -610,7 +589,6 @@ cmCPackIFWPackage* cmCPackIFWGenerator::GetComponentPackage( return pit != ComponentPackages.end() ? pit->second : 0; } -//---------------------------------------------------------------------------- void cmCPackIFWGenerator::WriteGeneratedByToStrim(cmXMLWriter &xout) { std::stringstream comment; diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 224d606..dfb336c 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -32,44 +32,37 @@ } \ } while ( 0 ) -//---------------------------------------------------------------------------- cmCPackIFWInstaller::cmCPackIFWInstaller() : Generator(0) { } -//---------------------------------------------------------------------------- const char *cmCPackIFWInstaller::GetOption(const std::string &op) const { return Generator ? Generator->GetOption(op) : 0; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsOn(const std::string &op) const { return Generator ? Generator->IsOn(op) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsVersionLess(const char *version) { return Generator ? Generator->IsVersionLess(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsVersionGreater(const char *version) { return Generator ? Generator->IsVersionGreater(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWInstaller::IsVersionEqual(const char *version) { return Generator ? Generator->IsVersionEqual(version) : false; } -//---------------------------------------------------------------------------- void cmCPackIFWInstaller::ConfigureFromOptions() { // Name; @@ -324,7 +317,6 @@ void cmCPackIFWInstaller::ConfigureFromOptions() } } -//---------------------------------------------------------------------------- void cmCPackIFWInstaller::GenerateInstallerFile() { // Lazy directory initialization @@ -486,7 +478,6 @@ void cmCPackIFWInstaller::GenerateInstallerFile() xout.EndDocument(); } -//---------------------------------------------------------------------------- void cmCPackIFWInstaller::GeneratePackageFiles() { if (Packages.empty() || Generator->IsOnePackage()) diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx index b71c7e3..a22c0b9 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.cxx +++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx @@ -45,7 +45,6 @@ cmCPackIFWPackage::DependenceStruct::DependenceStruct() { } -//---------------------------------------------------------------------------- cmCPackIFWPackage::DependenceStruct::DependenceStruct( const std::string &dependence) { @@ -79,7 +78,6 @@ cmCPackIFWPackage::DependenceStruct::DependenceStruct( Name = pos == std::string::npos ? dependence : dependence.substr(0, pos); } -//---------------------------------------------------------------------------- std::string cmCPackIFWPackage::DependenceStruct::NameWithCompare() const { if (Compare.Type == CompareNone) return Name; @@ -119,38 +117,32 @@ cmCPackIFWPackage::cmCPackIFWPackage() : { } -//---------------------------------------------------------------------------- const char *cmCPackIFWPackage::GetOption(const std::string &op) const { const char *option = Generator ? Generator->GetOption(op) : 0; return option && *option ? option : 0; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsOn(const std::string &op) const { return Generator ? Generator->IsOn(op) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsVersionLess(const char *version) { return Generator ? Generator->IsVersionLess(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsVersionGreater(const char *version) { return Generator ? Generator->IsVersionGreater(version) : false; } -//---------------------------------------------------------------------------- bool cmCPackIFWPackage::IsVersionEqual(const char *version) { return Generator ? Generator->IsVersionEqual(version) : false; } -//---------------------------------------------------------------------------- std::string cmCPackIFWPackage::GetComponentName(cmCPackComponent *component) { if (!component) return ""; @@ -161,7 +153,6 @@ std::string cmCPackIFWPackage::GetComponentName(cmCPackComponent *component) return option ? option : component->Name; } -//---------------------------------------------------------------------------- void cmCPackIFWPackage::DefaultConfiguration() { DisplayName = ""; @@ -176,7 +167,6 @@ void cmCPackIFWPackage::DefaultConfiguration() ForcedInstallation = ""; } -//---------------------------------------------------------------------------- // Defaul configuration (all in one package) int cmCPackIFWPackage::ConfigureFromOptions() { @@ -222,7 +212,6 @@ int cmCPackIFWPackage::ConfigureFromOptions() return 1; } -//---------------------------------------------------------------------------- int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent *component) { if(!component) return 0; @@ -329,7 +318,6 @@ int cmCPackIFWPackage::ConfigureFromComponent(cmCPackComponent *component) return 1; } -//---------------------------------------------------------------------------- int cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup *group) { @@ -389,7 +377,6 @@ cmCPackIFWPackage::ConfigureFromGroup(cmCPackComponentGroup *group) return 1; } -//---------------------------------------------------------------------------- int cmCPackIFWPackage::ConfigureFromGroup(const std::string &groupName) { // Group configuration @@ -431,7 +418,6 @@ int cmCPackIFWPackage::ConfigureFromGroup(const std::string &groupName) return ConfigureFromGroup(&group); } -//---------------------------------------------------------------------------- void cmCPackIFWPackage::GeneratePackageFile() { // Lazy directory initialization diff --git a/Source/CPack/cmCPack7zGenerator.cxx b/Source/CPack/cmCPack7zGenerator.cxx index 2809e56..06bf7e7 100644 --- a/Source/CPack/cmCPack7zGenerator.cxx +++ b/Source/CPack/cmCPack7zGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPack7zGenerator.h" -//---------------------------------------------------------------------- cmCPack7zGenerator::cmCPack7zGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressNone, "7zip") { } -//---------------------------------------------------------------------- cmCPack7zGenerator::~cmCPack7zGenerator() { } diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index 37e8bf0..05ea1d8 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -24,7 +24,6 @@ #include <cmsys/Directory.hxx> #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------- cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t, std::string const& format) { @@ -32,18 +31,15 @@ cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t, this->ArchiveFormat = format; } -//---------------------------------------------------------------------- cmCPackArchiveGenerator::~cmCPackArchiveGenerator() { } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "1"); return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive, cmCPackComponent* component) { @@ -118,7 +114,6 @@ if (!archive) \ return 0; \ } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup) { packageFileNames.clear(); @@ -220,7 +215,6 @@ int cmCPackArchiveGenerator::PackageComponents(bool ignoreGroup) return 1; } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::PackageComponentsAllInOne() { // reset the package file names @@ -248,7 +242,6 @@ int cmCPackArchiveGenerator::PackageComponentsAllInOne() return 1; } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::PackageFiles() { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: " @@ -300,7 +293,6 @@ int cmCPackArchiveGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackArchiveGenerator::GenerateHeader(std::ostream*) { return 1; diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx index e86667d..6cc48aa 100644 --- a/Source/CPack/cmCPackBundleGenerator.cxx +++ b/Source/CPack/cmCPackBundleGenerator.cxx @@ -17,17 +17,14 @@ #include <cmsys/RegularExpression.hxx> -//---------------------------------------------------------------------- cmCPackBundleGenerator::cmCPackBundleGenerator() { } -//---------------------------------------------------------------------- cmCPackBundleGenerator::~cmCPackBundleGenerator() { } -//---------------------------------------------------------------------- int cmCPackBundleGenerator::InitializeInternal() { const char* name = this->GetOption("CPACK_BUNDLE_NAME"); @@ -58,7 +55,6 @@ int cmCPackBundleGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- const char* cmCPackBundleGenerator::GetPackagingInstallPrefix() { this->InstallPrefix = "/"; @@ -68,7 +64,6 @@ const char* cmCPackBundleGenerator::GetPackagingInstallPrefix() return this->InstallPrefix.c_str(); } -//---------------------------------------------------------------------- int cmCPackBundleGenerator::ConstructBundle() { @@ -184,7 +179,6 @@ int cmCPackBundleGenerator::ConstructBundle() return 1; } -//---------------------------------------------------------------------- int cmCPackBundleGenerator::PackageFiles() { if(!this->ConstructBundle()) diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx index b847589..88c59f3 100644 --- a/Source/CPack/cmCPackComponentGroup.cxx +++ b/Source/CPack/cmCPackComponentGroup.cxx @@ -17,7 +17,6 @@ #include <string> #include <vector> -//---------------------------------------------------------------------- unsigned long cmCPackComponent::GetInstalledSize( const std::string& installDir) const { @@ -38,7 +37,6 @@ unsigned long cmCPackComponent::GetInstalledSize( return this->TotalSize; } -//---------------------------------------------------------------------- unsigned long cmCPackComponent::GetInstalledSizeInKbytes(const std::string& installDir) const { diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx index 687689c..a3176e9 100644 --- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx +++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx @@ -21,17 +21,14 @@ #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------- cmCPackCygwinBinaryGenerator::cmCPackCygwinBinaryGenerator() { } -//---------------------------------------------------------------------- cmCPackCygwinBinaryGenerator::~cmCPackCygwinBinaryGenerator() { } -//---------------------------------------------------------------------- int cmCPackCygwinBinaryGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr"); @@ -39,7 +36,6 @@ int cmCPackCygwinBinaryGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackCygwinBinaryGenerator::PackageFiles() { std::string packageName = this->GetOption("CPACK_PACKAGE_NAME"); diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx index d84b1ee..132ebcf 100644 --- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx +++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx @@ -29,24 +29,20 @@ # include <windows.h> #endif -//---------------------------------------------------------------------- cmCPackCygwinSourceGenerator::cmCPackCygwinSourceGenerator() { } -//---------------------------------------------------------------------- cmCPackCygwinSourceGenerator::~cmCPackCygwinSourceGenerator() { } -//---------------------------------------------------------------------- int cmCPackCygwinSourceGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "0"); return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackCygwinSourceGenerator::PackageFiles() { // Create a tar file of the sources diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 794955f..0911713 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -32,17 +32,14 @@ // Therefore we provide our own implementation of a BSD-ar: static int ar_append(const char*archive,const std::vector<std::string>& files); -//---------------------------------------------------------------------- cmCPackDebGenerator::cmCPackDebGenerator() { } -//---------------------------------------------------------------------- cmCPackDebGenerator::~cmCPackDebGenerator() { } -//---------------------------------------------------------------------- int cmCPackDebGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr"); @@ -53,7 +50,6 @@ int cmCPackDebGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel, std::string packageName) { @@ -115,7 +111,6 @@ int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel, return retval; } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) { int retval = 1; @@ -170,7 +165,6 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) return retval; } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageComponentsAllInOne() { int retval = 1; @@ -243,7 +237,6 @@ int cmCPackDebGenerator::PackageComponentsAllInOne() return retval; } -//---------------------------------------------------------------------- int cmCPackDebGenerator::PackageFiles() { int retval = -1; diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index b9c9c85..ea90c67 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -61,7 +61,6 @@ static const char* SLASTREnglish = "};\n" "\n"; -//---------------------------------------------------------------------- cmCPackDragNDropGenerator::cmCPackDragNDropGenerator() : singleLicense(false) { @@ -69,12 +68,10 @@ cmCPackDragNDropGenerator::cmCPackDragNDropGenerator() this->componentPackageMethod = ONE_PACKAGE; } -//---------------------------------------------------------------------- cmCPackDragNDropGenerator::~cmCPackDragNDropGenerator() { } -//---------------------------------------------------------------------- int cmCPackDragNDropGenerator::InitializeInternal() { // Starting with Xcode 4.3, look in "/Applications/Xcode.app" first: @@ -183,13 +180,11 @@ int cmCPackDragNDropGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- const char* cmCPackDragNDropGenerator::GetOutputExtension() { return ".dmg"; } -//---------------------------------------------------------------------- int cmCPackDragNDropGenerator::PackageFiles() { // gather which directories to make dmg files for @@ -245,7 +240,6 @@ int cmCPackDragNDropGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- bool cmCPackDragNDropGenerator::CopyFile(std::ostringstream& source, std::ostringstream& target) { @@ -266,7 +260,6 @@ bool cmCPackDragNDropGenerator::CopyFile(std::ostringstream& source, return true; } -//---------------------------------------------------------------------- bool cmCPackDragNDropGenerator::CreateEmptyFile(std::ostringstream& target, size_t size) { @@ -288,7 +281,6 @@ bool cmCPackDragNDropGenerator::CreateEmptyFile(std::ostringstream& target, return true; } -//---------------------------------------------------------------------- bool cmCPackDragNDropGenerator::RunCommand(std::ostringstream& command, std::string* output) { @@ -315,7 +307,6 @@ bool cmCPackDragNDropGenerator::RunCommand(std::ostringstream& command, return true; } -//---------------------------------------------------------------------- int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, const std::string& output_file) { diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 6cc67e7..04ee21a 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -31,7 +31,6 @@ #include <StorageDefs.h> #endif -//---------------------------------------------------------------------- cmCPackGenerator::cmCPackGenerator() { this->GeneratorVerbose = cmSystemTools::OUTPUT_NONE; @@ -40,20 +39,17 @@ cmCPackGenerator::cmCPackGenerator() this->componentPackageMethod = ONE_PACKAGE_PER_GROUP; } -//---------------------------------------------------------------------- cmCPackGenerator::~cmCPackGenerator() { this->MakefileMap = 0; } -//---------------------------------------------------------------------- void cmCPackGeneratorProgress(const char *msg, float prog, void* ptr) { cmCPackGenerator* self = static_cast<cmCPackGenerator*>(ptr); self->DisplayVerboseOutput(msg, prog); } -//---------------------------------------------------------------------- void cmCPackGenerator::DisplayVerboseOutput(const char* msg, float progress) { @@ -61,7 +57,6 @@ void cmCPackGenerator::DisplayVerboseOutput(const char* msg, cmCPackLogger(cmCPackLog::LOG_VERBOSE, "" << msg << std::endl); } -//---------------------------------------------------------------------- int cmCPackGenerator::PrepareNames() { cmCPackLogger(cmCPackLog::LOG_DEBUG, @@ -185,7 +180,6 @@ int cmCPackGenerator::PrepareNames() return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProject() { cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Install projects" << std::endl); @@ -267,7 +261,6 @@ int cmCPackGenerator::InstallProject() return res; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstallCommands( bool setDestDir, const std::string& tempInstallDirectory) { @@ -311,7 +304,6 @@ int cmCPackGenerator::InstallProjectViaInstallCommands( return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstalledDirectories( bool setDestDir, const std::string& tempInstallDirectory) { @@ -473,7 +465,6 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstallScript( bool setDestDir, const std::string& tempInstallDirectory) { @@ -540,7 +531,6 @@ int cmCPackGenerator::InstallProjectViaInstallScript( return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( bool setDestDir, const std::string& baseTempInstallDirectory) { @@ -983,7 +973,6 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( return 1; } -//---------------------------------------------------------------------- bool cmCPackGenerator::ReadListFile(const char* moduleName) { bool retval; @@ -994,7 +983,6 @@ bool cmCPackGenerator::ReadListFile(const char* moduleName) return retval; } -//---------------------------------------------------------------------- void cmCPackGenerator::SetOptionIfNotSet(const std::string& op, const char* value) { @@ -1006,7 +994,6 @@ void cmCPackGenerator::SetOptionIfNotSet(const std::string& op, this->SetOption(op, value); } -//---------------------------------------------------------------------- void cmCPackGenerator::SetOption(const std::string& op, const char* value) { if ( !value ) @@ -1019,7 +1006,6 @@ void cmCPackGenerator::SetOption(const std::string& op, const char* value) this->MakefileMap->AddDefinition(op, value); } -//---------------------------------------------------------------------- int cmCPackGenerator::DoPackage() { cmCPackLogger(cmCPackLog::LOG_OUTPUT, @@ -1160,7 +1146,6 @@ int cmCPackGenerator::DoPackage() return 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf) { this->MakefileMap = mf; @@ -1188,25 +1173,21 @@ int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf) return result; } -//---------------------------------------------------------------------- int cmCPackGenerator::InitializeInternal() { return 1; } -//---------------------------------------------------------------------- bool cmCPackGenerator::IsSet(const std::string& name) const { return this->MakefileMap->IsSet(name); } -//---------------------------------------------------------------------- bool cmCPackGenerator::IsOn(const std::string& name) const { return cmSystemTools::IsOn(GetOption(name)); } -//---------------------------------------------------------------------- const char* cmCPackGenerator::GetOption(const std::string& op) const { const char* ret = this->MakefileMap->GetDefinition(op); @@ -1220,19 +1201,16 @@ const char* cmCPackGenerator::GetOption(const std::string& op) const return ret; } -//---------------------------------------------------------------------- std::vector<std::string> cmCPackGenerator::GetOptions() const { return this->MakefileMap->GetDefinitions(); } -//---------------------------------------------------------------------- int cmCPackGenerator::PackageFiles() { return 0; } -//---------------------------------------------------------------------- const char* cmCPackGenerator::GetInstallPath() { if ( !this->InstallPath.empty() ) @@ -1275,7 +1253,6 @@ const char* cmCPackGenerator::GetInstallPath() return this->InstallPath.c_str(); } -//---------------------------------------------------------------------- const char* cmCPackGenerator::GetPackagingInstallPrefix() { cmCPackLogger(cmCPackLog::LOG_DEBUG, "GetPackagingInstallPrefix: '" @@ -1284,7 +1261,6 @@ const char* cmCPackGenerator::GetPackagingInstallPrefix() return this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX"); } -//---------------------------------------------------------------------- std::string cmCPackGenerator::FindTemplate(const char* name) { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: " @@ -1295,7 +1271,6 @@ std::string cmCPackGenerator::FindTemplate(const char* name) return ffile; } -//---------------------------------------------------------------------- bool cmCPackGenerator::ConfigureString(const std::string& inString, std::string& outString) { @@ -1304,7 +1279,6 @@ bool cmCPackGenerator::ConfigureString(const std::string& inString, return true; } -//---------------------------------------------------------------------- bool cmCPackGenerator::ConfigureFile(const char* inName, const char* outName, bool copyOnly /* = false */) { @@ -1312,7 +1286,6 @@ bool cmCPackGenerator::ConfigureFile(const char* inName, copyOnly, true, false) == 1; } -//---------------------------------------------------------------------- int cmCPackGenerator::CleanTemporaryDirectory() { std::string tempInstallDirectoryWithPostfix @@ -1335,7 +1308,6 @@ int cmCPackGenerator::CleanTemporaryDirectory() return 1; } -//---------------------------------------------------------------------- cmInstalledFile const* cmCPackGenerator::GetInstalledFile( std::string const& name) const { @@ -1343,7 +1315,6 @@ cmInstalledFile const* cmCPackGenerator::GetInstalledFile( return cm->GetInstalledFile(name); } -//---------------------------------------------------------------------- int cmCPackGenerator::PrepareGroupingKind() { // find a component package method specified by the user @@ -1440,12 +1411,10 @@ int cmCPackGenerator::PrepareGroupingKind() return 1; } -//---------------------------------------------------------------------- std::string cmCPackGenerator::GetComponentInstallDirNameSuffix( const std::string& componentName) { return componentName; } -//---------------------------------------------------------------------- std::string cmCPackGenerator::GetComponentPackageFileName( const std::string& initialPackageFileName, const std::string& groupOrComponentName, @@ -1486,26 +1455,22 @@ std::string cmCPackGenerator::GetComponentPackageFileName( return initialPackageFileName + suffix; } -//---------------------------------------------------------------------- enum cmCPackGenerator::CPackSetDestdirSupport cmCPackGenerator::SupportsSetDestdir() const { return cmCPackGenerator::SETDESTDIR_SUPPORTED; } -//---------------------------------------------------------------------- bool cmCPackGenerator::SupportsAbsoluteDestination() const { return true; } -//---------------------------------------------------------------------- bool cmCPackGenerator::SupportsComponentInstallation() const { return false; } -//---------------------------------------------------------------------- bool cmCPackGenerator::WantsComponentInstallation() const { return (!IsOn("CPACK_MONOLITHIC_INSTALL") @@ -1514,7 +1479,6 @@ bool cmCPackGenerator::WantsComponentInstallation() const && (!this->ComponentGroups.empty() || !this->Components.empty())); } -//---------------------------------------------------------------------- cmCPackInstallationType* cmCPackGenerator::GetInstallationType(const std::string& projectName, const std::string& name) @@ -1546,7 +1510,6 @@ cmCPackGenerator::GetInstallationType(const std::string& projectName, return installType; } -//---------------------------------------------------------------------- cmCPackComponent* cmCPackGenerator::GetComponent(const std::string& projectName, const std::string& name) @@ -1642,7 +1605,6 @@ cmCPackGenerator::GetComponent(const std::string& projectName, return component; } -//---------------------------------------------------------------------- cmCPackComponentGroup* cmCPackGenerator::GetComponentGroup(const std::string& projectName, const std::string& name) diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 669964d..5a63dbc 100644 --- a/Source/CPack/cmCPackGeneratorFactory.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -49,7 +49,6 @@ #include "cmCPackLog.h" -//---------------------------------------------------------------------- cmCPackGeneratorFactory::cmCPackGeneratorFactory() { if (cmCPackTGZGenerator::CanGenerate()) @@ -156,13 +155,11 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() #endif } -//---------------------------------------------------------------------- cmCPackGeneratorFactory::~cmCPackGeneratorFactory() { cmDeleteAll(this->Generators); } -//---------------------------------------------------------------------- cmCPackGenerator* cmCPackGeneratorFactory::NewGenerator( const std::string& name) { @@ -176,7 +173,6 @@ cmCPackGenerator* cmCPackGeneratorFactory::NewGenerator( return gen; } -//---------------------------------------------------------------------- cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal( const std::string& name) { @@ -189,7 +185,6 @@ cmCPackGenerator* cmCPackGeneratorFactory::NewGeneratorInternal( return (it->second)(); } -//---------------------------------------------------------------------- void cmCPackGeneratorFactory::RegisterGenerator(const std::string& name, const char* generatorDescription, CreateGeneratorCall* createGenerator) diff --git a/Source/CPack/cmCPackLog.cxx b/Source/CPack/cmCPackLog.cxx index 7633ac2..61d97c8 100644 --- a/Source/CPack/cmCPackLog.cxx +++ b/Source/CPack/cmCPackLog.cxx @@ -15,7 +15,6 @@ #include "cmGeneratedFileStream.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------- cmCPackLog::cmCPackLog() { this->Verbose = false; @@ -33,13 +32,11 @@ cmCPackLog::cmCPackLog() this->LogOutputCleanup = false; } -//---------------------------------------------------------------------- cmCPackLog::~cmCPackLog() { this->SetLogOutputStream(0); } -//---------------------------------------------------------------------- void cmCPackLog::SetLogOutputStream(std::ostream* os) { if ( this->LogOutputCleanup && this->LogOutput ) @@ -50,7 +47,6 @@ void cmCPackLog::SetLogOutputStream(std::ostream* os) this->LogOutput = os; } -//---------------------------------------------------------------------- bool cmCPackLog::SetLogOutputFile(const char* fname) { cmGeneratedFileStream *cg = 0; @@ -72,7 +68,6 @@ bool cmCPackLog::SetLogOutputFile(const char* fname) return true; } -//---------------------------------------------------------------------- void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_t length) { diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index a5a9a19..9d6a457 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -31,18 +31,15 @@ # define NSIS_OPT "-" #endif -//---------------------------------------------------------------------- cmCPackNSISGenerator::cmCPackNSISGenerator(bool nsis64) { Nsis64 = nsis64; } -//---------------------------------------------------------------------- cmCPackNSISGenerator::~cmCPackNSISGenerator() { } -//---------------------------------------------------------------------- int cmCPackNSISGenerator::PackageFiles() { // TODO: Fix nsis to force out file name @@ -361,7 +358,6 @@ int cmCPackNSISGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackNSISGenerator::InitializeInternal() { if ( cmSystemTools::IsOn(this->GetOption( @@ -585,7 +581,6 @@ int cmCPackNSISGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- void cmCPackNSISGenerator::CreateMenuLinks( std::ostringstream& str, std::ostringstream& deleteStr) { @@ -663,7 +658,6 @@ void cmCPackNSISGenerator::CreateMenuLinks( std::ostringstream& str, } } -//---------------------------------------------------------------------- bool cmCPackNSISGenerator::GetListOfSubdirectories(const char* topdir, std::vector<std::string>& dirs) { @@ -692,26 +686,22 @@ bool cmCPackNSISGenerator::GetListOfSubdirectories(const char* topdir, return true; } -//---------------------------------------------------------------------- enum cmCPackGenerator::CPackSetDestdirSupport cmCPackNSISGenerator::SupportsSetDestdir() const { return cmCPackGenerator::SETDESTDIR_SHOULD_NOT_BE_USED; } -//---------------------------------------------------------------------- bool cmCPackNSISGenerator::SupportsAbsoluteDestination() const { return false; } -//---------------------------------------------------------------------- bool cmCPackNSISGenerator::SupportsComponentInstallation() const { return true; } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator:: CreateComponentDescription(cmCPackComponent *component, @@ -946,7 +936,6 @@ CreateComponentDescription(cmCPackComponent *component, return componentCode; } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator::CreateSelectionDependenciesDescription (cmCPackComponent *component, std::set<cmCPackComponent *>& visited) @@ -978,7 +967,6 @@ std::string cmCPackNSISGenerator::CreateSelectionDependenciesDescription } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription (cmCPackComponent *component, std::set<cmCPackComponent *>& visited) @@ -1011,7 +999,6 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription return out.str(); } -//---------------------------------------------------------------------- std::string cmCPackNSISGenerator:: CreateComponentGroupDescription(cmCPackComponentGroup *group, diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 1d7ef69..42b8c62 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -23,17 +23,14 @@ #include <cmsys/SystemTools.hxx> #include <sys/stat.h> -//---------------------------------------------------------------------- cmCPackOSXX11Generator::cmCPackOSXX11Generator() { } -//---------------------------------------------------------------------- cmCPackOSXX11Generator::~cmCPackOSXX11Generator() { } -//---------------------------------------------------------------------- int cmCPackOSXX11Generator::PackageFiles() { // TODO: Use toplevel ? @@ -206,7 +203,6 @@ int cmCPackOSXX11Generator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackOSXX11Generator::InitializeInternal() { cmCPackLogger(cmCPackLog::LOG_DEBUG, @@ -225,7 +221,6 @@ int cmCPackOSXX11Generator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- /* bool cmCPackOSXX11Generator::CopyCreateResourceFile(const std::string& name) { @@ -270,7 +265,6 @@ bool cmCPackOSXX11Generator::CopyCreateResourceFile(const std::string& name) } */ -//---------------------------------------------------------------------- bool cmCPackOSXX11Generator::CopyResourcePlistFile(const std::string& name, const std::string& dir, const char* outputFileName /* = 0 */, bool copyOnly /* = false */) @@ -301,7 +295,6 @@ bool cmCPackOSXX11Generator::CopyResourcePlistFile(const std::string& name, return true; } -//---------------------------------------------------------------------- const char* cmCPackOSXX11Generator::GetPackagingInstallPrefix() { this->InstallPrefix = "/"; diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 4f6238e..71a5b12 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -32,25 +32,21 @@ unsigned int getVersion(unsigned int major, unsigned int minor) return ((major & 0xFF) << 16 | minor); } -//---------------------------------------------------------------------- cmCPackPackageMakerGenerator::cmCPackPackageMakerGenerator() { this->PackageMakerVersion = 0.0; this->PackageCompatibilityVersion = getVersion(10, 4); } -//---------------------------------------------------------------------- cmCPackPackageMakerGenerator::~cmCPackPackageMakerGenerator() { } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator::SupportsComponentInstallation() const { return this->PackageCompatibilityVersion >= getVersion(10, 4); } -//---------------------------------------------------------------------- int cmCPackPackageMakerGenerator::CopyInstallScript(const std::string& resdir, const std::string& script, const std::string& name) @@ -67,7 +63,6 @@ int cmCPackPackageMakerGenerator::CopyInstallScript(const std::string& resdir, return 1; } -//---------------------------------------------------------------------- int cmCPackPackageMakerGenerator::PackageFiles() { // TODO: Use toplevel @@ -403,7 +398,6 @@ int cmCPackPackageMakerGenerator::PackageFiles() return 1; } -//---------------------------------------------------------------------- int cmCPackPackageMakerGenerator::InitializeInternal() { cmCPackLogger(cmCPackLog::LOG_DEBUG, @@ -567,7 +561,6 @@ int cmCPackPackageMakerGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator::CopyCreateResourceFile( const std::string& name, const std::string& dirName) @@ -646,7 +639,6 @@ bool cmCPackPackageMakerGenerator::CopyResourcePlistFile( return true; } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator::RunPackageMaker(const char *command, const char *packageFile) { @@ -695,7 +687,6 @@ bool cmCPackPackageMakerGenerator::RunPackageMaker(const char *command, return true; } -//---------------------------------------------------------------------- std::string cmCPackPackageMakerGenerator::GetPackageName(const cmCPackComponent& component) { @@ -714,7 +705,6 @@ cmCPackPackageMakerGenerator::GetPackageName(const cmCPackComponent& component) } } -//---------------------------------------------------------------------- bool cmCPackPackageMakerGenerator:: GenerateComponentPackage(const char *packageFile, @@ -797,7 +787,6 @@ GenerateComponentPackage(const char *packageFile, return RunPackageMaker(pkgCmd.str().c_str(), packageFile); } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: WriteDistributionFile(const char* metapackageFile) @@ -875,7 +864,6 @@ WriteDistributionFile(const char* metapackageFile) distributionFile.c_str()); } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: CreateChoiceOutline(const cmCPackComponentGroup& group, @@ -899,7 +887,6 @@ CreateChoiceOutline(const cmCPackComponentGroup& group, out << "</line>" << std::endl; } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponentGroup& group, std::ostringstream& out) @@ -917,7 +904,6 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponentGroup& group, out << "></choice>" << std::endl; } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, std::ostringstream& out) @@ -1001,7 +987,6 @@ cmCPackPackageMakerGenerator::CreateChoice(const cmCPackComponent& component, out << "</pkg-ref>" << std::endl; } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: AddDependencyAttributes(const cmCPackComponent& component, @@ -1025,7 +1010,6 @@ AddDependencyAttributes(const cmCPackComponent& component, } } -//---------------------------------------------------------------------- void cmCPackPackageMakerGenerator:: AddReverseDependencyAttributes(const cmCPackComponent& component, @@ -1048,7 +1032,6 @@ AddReverseDependencyAttributes(const cmCPackComponent& component, } } -//---------------------------------------------------------------------- std::string cmCPackPackageMakerGenerator::EscapeForXML(std::string str) { cmSystemTools::ReplaceString(str, "&", "&"); diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index 706f43a..6349e05 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -14,17 +14,14 @@ #include "cmCPackLog.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------- cmCPackRPMGenerator::cmCPackRPMGenerator() { } -//---------------------------------------------------------------------- cmCPackRPMGenerator::~cmCPackRPMGenerator() { } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_PACKAGING_INSTALL_PREFIX", "/usr"); @@ -50,7 +47,6 @@ int cmCPackRPMGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageOnePack(std::string initialToplevel, std::string packageName) { @@ -94,7 +90,6 @@ int cmCPackRPMGenerator::PackageOnePack(std::string initialToplevel, return retval; } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup) { int retval = 1; @@ -147,7 +142,6 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup) return retval; } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageComponentsAllInOne() { int retval = 1; @@ -201,7 +195,6 @@ int cmCPackRPMGenerator::PackageComponentsAllInOne() return retval; } -//---------------------------------------------------------------------- int cmCPackRPMGenerator::PackageFiles() { int retval = 1; diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index 4a8754e..41e67c7 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -24,17 +24,14 @@ // include sys/stat.h after sys/types.h #include <sys/stat.h> -//---------------------------------------------------------------------- cmCPackSTGZGenerator::cmCPackSTGZGenerator() { } -//---------------------------------------------------------------------- cmCPackSTGZGenerator::~cmCPackSTGZGenerator() { } -//---------------------------------------------------------------------- int cmCPackSTGZGenerator::InitializeInternal() { this->SetOptionIfNotSet("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", "0"); @@ -52,7 +49,6 @@ int cmCPackSTGZGenerator::InitializeInternal() return this->Superclass::InitializeInternal(); } -//---------------------------------------------------------------------- int cmCPackSTGZGenerator::PackageFiles() { bool retval = true; @@ -81,7 +77,6 @@ int cmCPackSTGZGenerator::PackageFiles() return retval; } -//---------------------------------------------------------------------- int cmCPackSTGZGenerator::GenerateHeader(std::ostream* os) { cmCPackLogger(cmCPackLog::LOG_DEBUG, "Writing header" << std::endl); diff --git a/Source/CPack/cmCPackTGZGenerator.cxx b/Source/CPack/cmCPackTGZGenerator.cxx index 3fa2b64..90eb1a3 100644 --- a/Source/CPack/cmCPackTGZGenerator.cxx +++ b/Source/CPack/cmCPackTGZGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTGZGenerator.h" -//---------------------------------------------------------------------- cmCPackTGZGenerator::cmCPackTGZGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressGZip, "paxr") { } -//---------------------------------------------------------------------- cmCPackTGZGenerator::~cmCPackTGZGenerator() { } diff --git a/Source/CPack/cmCPackTXZGenerator.cxx b/Source/CPack/cmCPackTXZGenerator.cxx index 6d4ede1..454e062 100644 --- a/Source/CPack/cmCPackTXZGenerator.cxx +++ b/Source/CPack/cmCPackTXZGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTXZGenerator.h" -//---------------------------------------------------------------------- cmCPackTXZGenerator::cmCPackTXZGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressXZ, "paxr") { } -//---------------------------------------------------------------------- cmCPackTXZGenerator::~cmCPackTXZGenerator() { } diff --git a/Source/CPack/cmCPackTarBZip2Generator.cxx b/Source/CPack/cmCPackTarBZip2Generator.cxx index da16737..b05b399 100644 --- a/Source/CPack/cmCPackTarBZip2Generator.cxx +++ b/Source/CPack/cmCPackTarBZip2Generator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTarBZip2Generator.h" -//---------------------------------------------------------------------- cmCPackTarBZip2Generator::cmCPackTarBZip2Generator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2, "paxr") { } -//---------------------------------------------------------------------- cmCPackTarBZip2Generator::~cmCPackTarBZip2Generator() { } diff --git a/Source/CPack/cmCPackTarCompressGenerator.cxx b/Source/CPack/cmCPackTarCompressGenerator.cxx index 1c8311b..ddfe248 100644 --- a/Source/CPack/cmCPackTarCompressGenerator.cxx +++ b/Source/CPack/cmCPackTarCompressGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackTarCompressGenerator.h" -//---------------------------------------------------------------------- cmCPackTarCompressGenerator::cmCPackTarCompressGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressCompress, "paxr") { } -//---------------------------------------------------------------------- cmCPackTarCompressGenerator::~cmCPackTarCompressGenerator() { } diff --git a/Source/CPack/cmCPackZIPGenerator.cxx b/Source/CPack/cmCPackZIPGenerator.cxx index 7ef7729..d316ab6 100644 --- a/Source/CPack/cmCPackZIPGenerator.cxx +++ b/Source/CPack/cmCPackZIPGenerator.cxx @@ -12,14 +12,12 @@ #include "cmCPackZIPGenerator.h" -//---------------------------------------------------------------------- cmCPackZIPGenerator::cmCPackZIPGenerator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressNone, "zip") { } -//---------------------------------------------------------------------- cmCPackZIPGenerator::~cmCPackZIPGenerator() { } diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 813fb01..6b2323c 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -26,7 +26,6 @@ #include <cmsys/Encoding.hxx> #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = { {0, @@ -34,7 +33,6 @@ static const char * cmDocumentationName[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsage[][2] = { {0, @@ -42,7 +40,6 @@ static const char * cmDocumentationUsage[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationOptions[][2] = { {"-G <generator>", "Use the specified generator to generate package."}, @@ -58,13 +55,11 @@ static const char * cmDocumentationOptions[][2] = {0,0} }; -//---------------------------------------------------------------------------- int cpackUnknownArgument(const char*, void*) { return 1; } -//---------------------------------------------------------------------------- struct cpackDefinitions { typedef std::map<std::string, std::string> MapType; @@ -72,7 +67,6 @@ struct cpackDefinitions cmCPackLog *Log; }; -//---------------------------------------------------------------------------- int cpackDefinitionArgument(const char* argument, const char* cValue, void* call_data) { @@ -95,7 +89,6 @@ int cpackDefinitionArgument(const char* argument, const char* cValue, } -//---------------------------------------------------------------------------- // this is CPack. int main (int argc, char const* const* argv) { diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index eb18b70..6dd17b0 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -19,7 +19,6 @@ #include <cm_expat.h> -//---------------------------------------------------------------------------- extern "C" int cmBZRXMLParserUnknownEncodingHandler(void*, const XML_Char *name, @@ -75,7 +74,6 @@ int cmBZRXMLParserUnknownEncodingHandler(void*, return 0; } -//---------------------------------------------------------------------------- cmCTestBZR::cmCTestBZR(cmCTest* ct, std::ostream& log): cmCTestGlobalVC(ct, log) { @@ -86,12 +84,10 @@ cmCTestBZR::cmCTestBZR(cmCTest* ct, std::ostream& log): cmSystemTools::PutEnv("BZR_PROGRESS_BAR=none"); } -//---------------------------------------------------------------------------- cmCTestBZR::~cmCTestBZR() { } -//---------------------------------------------------------------------------- class cmCTestBZR::InfoParser: public cmCTestVC::LineParser { public: @@ -122,7 +118,6 @@ private: } }; -//---------------------------------------------------------------------------- class cmCTestBZR::RevnoParser: public cmCTestVC::LineParser { public: @@ -145,7 +140,6 @@ private: } }; -//---------------------------------------------------------------------------- std::string cmCTestBZR::LoadInfo() { // Run "bzr info" to get the repository info from the work tree. @@ -174,7 +168,6 @@ void cmCTestBZR::NoteOldRevision() this->PriorRev.Rev = this->OldRevision; } -//---------------------------------------------------------------------------- void cmCTestBZR::NoteNewRevision() { this->NewRevision = this->LoadInfo(); @@ -184,7 +177,6 @@ void cmCTestBZR::NoteNewRevision() this->Log << "URL = " << this->URL << "\n"; } -//---------------------------------------------------------------------------- class cmCTestBZR::LogParser: public cmCTestVC::OutputLogger, private cmXMLParser { @@ -314,7 +306,6 @@ private: } }; -//---------------------------------------------------------------------------- class cmCTestBZR::UpdateParser: public cmCTestVC::LineParser { public: @@ -399,7 +390,6 @@ private: } }; -//---------------------------------------------------------------------------- bool cmCTestBZR::UpdateImpl() { // Get user-specified update options. @@ -433,7 +423,6 @@ bool cmCTestBZR::UpdateImpl() return this->RunUpdateCommand(&bzr_update[0], &out, &err); } -//---------------------------------------------------------------------------- void cmCTestBZR::LoadRevisions() { cmCTestLog(this->CTest, HANDLER_OUTPUT, @@ -465,7 +454,6 @@ void cmCTestBZR::LoadRevisions() cmCTestLog(this->CTest, HANDLER_OUTPUT, std::endl); } -//---------------------------------------------------------------------------- class cmCTestBZR::StatusParser: public cmCTestVC::LineParser { public: @@ -510,7 +498,6 @@ private: } }; -//---------------------------------------------------------------------------- void cmCTestBZR::LoadModifications() { // Run "bzr status" which reports local modifications. diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx index 41f4f12..6127551 100644 --- a/Source/CTest/cmCTestBatchTestHandler.cxx +++ b/Source/CTest/cmCTestBatchTestHandler.cxx @@ -22,14 +22,12 @@ cmCTestBatchTestHandler::~cmCTestBatchTestHandler() { } -//--------------------------------------------------------- void cmCTestBatchTestHandler::RunTests() { this->WriteBatchScript(); this->SubmitBatchScript(); } -//--------------------------------------------------------- void cmCTestBatchTestHandler::WriteBatchScript() { this->Script = this->CTest->GetBinaryDir() @@ -48,7 +46,6 @@ void cmCTestBatchTestHandler::WriteBatchScript() fout.close(); } -//--------------------------------------------------------- void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout) { cmCTestTestHandler::cmCTestTestProperties* properties = @@ -79,7 +76,6 @@ void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout) } } -//--------------------------------------------------------- void cmCTestBatchTestHandler::WriteTestCommand(int test, cmsys::ofstream& fout) { std::vector<std::string> args = this->Properties[test]->Args; @@ -121,7 +117,6 @@ void cmCTestBatchTestHandler::WriteTestCommand(int test, cmsys::ofstream& fout) //this->TestResult.FullCommandLine = this->TestCommand; } -//--------------------------------------------------------- void cmCTestBatchTestHandler::SubmitBatchScript() { cmProcess sbatch; diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 52433da..6ea9a89 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -19,7 +19,6 @@ #include "cmake.h" #include <cmsys/Process.h> -//---------------------------------------------------------------------- cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler() { this->BuildTwoConfig = false; @@ -28,19 +27,16 @@ cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler() this->Timeout = 0; } -//---------------------------------------------------------------------- void cmCTestBuildAndTestHandler::Initialize() { this->BuildTargets.clear(); this->Superclass::Initialize(); } -//---------------------------------------------------------------------- const char* cmCTestBuildAndTestHandler::GetOutput() { return this->Output.c_str(); } -//---------------------------------------------------------------------- int cmCTestBuildAndTestHandler::ProcessHandler() { this->Output = ""; @@ -51,7 +47,6 @@ int cmCTestBuildAndTestHandler::ProcessHandler() return retv; } -//---------------------------------------------------------------------- int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring, std::ostringstream &out, std::string &cmakeOutString, std::string &cwd, cmake *cm) @@ -144,7 +139,6 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring, return 0; } -//---------------------------------------------------------------------- void CMakeMessageCallback(const char* m, const char*, bool&, void* s) { std::string* out = (std::string*)s; @@ -159,14 +153,12 @@ void CMakeProgressCallback(const char*msg, float , void * s) *out += "\n"; } -//---------------------------------------------------------------------- void CMakeOutputCallback(const char* m, size_t len, void* s) { std::string* out = (std::string*)s; out->append(m, len); } -//---------------------------------------------------------------------- class cmCTestBuildAndTestCaptureRAII { cmake& CM; @@ -187,7 +179,6 @@ public: } }; -//---------------------------------------------------------------------- int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) { // if the generator and make program are not specified then it is an error @@ -436,7 +427,6 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) return retval; } -//---------------------------------------------------------------------- int cmCTestBuildAndTestHandler::ProcessCommandLineArguments( const std::string& currentArg, size_t& idx, const std::vector<std::string>& allArgs) diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 957e3e4..ca3960f 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -18,7 +18,6 @@ #include "cmake.h" -//---------------------------------------------------------------------------- cmCTestBuildCommand::cmCTestBuildCommand() { this->GlobalGenerator = 0; @@ -32,7 +31,6 @@ cmCTestBuildCommand::cmCTestBuildCommand() this->Last = ctb_LAST; } -//---------------------------------------------------------------------------- cmCTestBuildCommand::~cmCTestBuildCommand() { if ( this->GlobalGenerator ) @@ -42,7 +40,6 @@ cmCTestBuildCommand::~cmCTestBuildCommand() } } -//---------------------------------------------------------------------------- cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler() { cmCTestGenericHandler* handler diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 1b31533..9647968 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -174,7 +174,6 @@ cmCTestWarningErrorFileLine[] = { { 0, 0, 0 } }; -//---------------------------------------------------------------------- cmCTestBuildHandler::cmCTestBuildHandler() { this->MaxPreContext = 10; @@ -188,7 +187,6 @@ cmCTestBuildHandler::cmCTestBuildHandler() this->UseCTestLaunch = false; } -//---------------------------------------------------------------------- void cmCTestBuildHandler::Initialize() { this->Superclass::Initialize(); @@ -234,7 +232,6 @@ void cmCTestBuildHandler::Initialize() this->UseCTestLaunch = false; } -//---------------------------------------------------------------------- void cmCTestBuildHandler::PopulateCustomVectors(cmMakefile *mf) { this->CTest->PopulateCustomVector(mf, "CTEST_CUSTOM_ERROR_MATCH", @@ -281,7 +278,6 @@ void cmCTestBuildHandler::PopulateCustomVectors(cmMakefile *mf) } } -//---------------------------------------------------------------------- std::string cmCTestBuildHandler::GetMakeCommand() { std::string makeCommand @@ -307,7 +303,6 @@ std::string cmCTestBuildHandler::GetMakeCommand() return makeCommand; } -//---------------------------------------------------------------------- //clearly it would be nice if this were broken up into a few smaller //functions and commented... int cmCTestBuildHandler::ProcessHandler() @@ -551,7 +546,6 @@ int cmCTestBuildHandler::ProcessHandler() return retVal; } -//---------------------------------------------------------------------------- void cmCTestBuildHandler::GenerateXMLHeader(cmXMLWriter& xml) { this->CTest->StartXML(xml, this->AppendXML); @@ -562,7 +556,6 @@ void cmCTestBuildHandler::GenerateXMLHeader(cmXMLWriter& xml) xml.Element("BuildCommand", this->GetMakeCommand()); } -//---------------------------------------------------------------------------- class cmCTestBuildHandler::FragmentCompare { public: @@ -587,7 +580,6 @@ private: cmFileTimeComparison* FTC; }; -//---------------------------------------------------------------------------- void cmCTestBuildHandler::GenerateXMLLaunched(cmXMLWriter& xml) { if(this->CTestLaunchDir.empty()) @@ -633,7 +625,6 @@ void cmCTestBuildHandler::GenerateXMLLaunched(cmXMLWriter& xml) } } -//---------------------------------------------------------------------------- void cmCTestBuildHandler::GenerateXMLLogScraped(cmXMLWriter& xml) { std::vector<cmCTestBuildErrorWarning>& ew = this->ErrorsAndWarnings; @@ -730,7 +721,6 @@ void cmCTestBuildHandler::GenerateXMLLogScraped(cmXMLWriter& xml) } } -//---------------------------------------------------------------------------- void cmCTestBuildHandler::GenerateXMLFooter(cmXMLWriter& xml, double elapsed_build_time) { @@ -746,7 +736,6 @@ void cmCTestBuildHandler::GenerateXMLFooter(cmXMLWriter& xml, this->CTest->EndXML(xml); } -//---------------------------------------------------------------------------- bool cmCTestBuildHandler::IsLaunchedErrorFile(const char* fname) { // error-{hash}.xml @@ -754,7 +743,6 @@ bool cmCTestBuildHandler::IsLaunchedErrorFile(const char* fname) strcmp(fname+strlen(fname)-4, ".xml") == 0); } -//---------------------------------------------------------------------------- bool cmCTestBuildHandler::IsLaunchedWarningFile(const char* fname) { // warning-{hash}.xml @@ -767,7 +755,6 @@ bool cmCTestBuildHandler::IsLaunchedWarningFile(const char* fname) //###################################################################### //###################################################################### -//---------------------------------------------------------------------------- class cmCTestBuildHandler::LaunchHelper { public: @@ -782,7 +769,6 @@ private: std::vector<std::string> const& matchers); }; -//---------------------------------------------------------------------------- cmCTestBuildHandler::LaunchHelper::LaunchHelper(cmCTestBuildHandler* handler): Handler(handler), CTest(handler->CTest) { @@ -823,7 +809,6 @@ cmCTestBuildHandler::LaunchHelper::LaunchHelper(cmCTestBuildHandler* handler): } } -//---------------------------------------------------------------------------- cmCTestBuildHandler::LaunchHelper::~LaunchHelper() { if(this->Handler->UseCTestLaunch) @@ -832,7 +817,6 @@ cmCTestBuildHandler::LaunchHelper::~LaunchHelper() } } -//---------------------------------------------------------------------------- void cmCTestBuildHandler::LaunchHelper::WriteLauncherConfig() { this->WriteScrapeMatchers("Warning", @@ -848,7 +832,6 @@ void cmCTestBuildHandler::LaunchHelper::WriteLauncherConfig() fout << "set(CTEST_SOURCE_DIRECTORY \"" << srcdir << "\")\n"; } -//---------------------------------------------------------------------------- void cmCTestBuildHandler::LaunchHelper ::WriteScrapeMatchers(const char* purpose, @@ -870,7 +853,6 @@ cmCTestBuildHandler::LaunchHelper } } -//---------------------------------------------------------------------- int cmCTestBuildHandler::RunMakeCommand(const char* command, int* retVal, const char* dir, int timeout, std::ostream& ofs) { @@ -1039,7 +1021,6 @@ int cmCTestBuildHandler::RunMakeCommand(const char* command, //###################################################################### //###################################################################### -//---------------------------------------------------------------------- void cmCTestBuildHandler::ProcessBuffer(const char* data, int length, size_t& tick, size_t tick_len, std::ostream& ofs, t_BuildProcessingQueueType* queue) @@ -1197,7 +1178,6 @@ void cmCTestBuildHandler::ProcessBuffer(const char* data, int length, ofs << cmCTestLogWrite(data, length); } -//---------------------------------------------------------------------- int cmCTestBuildHandler::ProcessSingleLine(const char* data) { if(this->UseCTestLaunch) diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx index 01bc1c4..7ab87c2 100644 --- a/Source/CTest/cmCTestCVS.cxx +++ b/Source/CTest/cmCTestCVS.cxx @@ -18,17 +18,14 @@ #include <cmsys/FStream.hxx> #include <cmsys/RegularExpression.hxx> -//---------------------------------------------------------------------------- cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log): cmCTestVC(ct, log) { } -//---------------------------------------------------------------------------- cmCTestCVS::~cmCTestCVS() { } -//---------------------------------------------------------------------------- class cmCTestCVS::UpdateParser: public cmCTestVC::LineParser { public: @@ -86,7 +83,6 @@ private: } }; -//---------------------------------------------------------------------------- bool cmCTestCVS::UpdateImpl() { // Get user-specified update options. @@ -124,7 +120,6 @@ bool cmCTestCVS::UpdateImpl() return this->RunUpdateCommand(&cvs_update[0], &out, &err); } -//---------------------------------------------------------------------------- class cmCTestCVS::LogParser: public cmCTestVC::LineParser { public: @@ -220,7 +215,6 @@ private: } }; -//---------------------------------------------------------------------------- std::string cmCTestCVS::ComputeBranchFlag(std::string const& dir) { // Compute the tag file location for this directory. @@ -250,7 +244,6 @@ std::string cmCTestCVS::ComputeBranchFlag(std::string const& dir) } } -//---------------------------------------------------------------------------- void cmCTestCVS::LoadRevisions(std::string const& file, const char* branchFlag, std::vector<Revision>& revisions) @@ -267,7 +260,6 @@ void cmCTestCVS::LoadRevisions(std::string const& file, this->RunChild(cvs_log, &out, &err); } -//---------------------------------------------------------------------------- void cmCTestCVS::WriteXMLDirectory(cmXMLWriter& xml, std::string const& path, Directory const& dir) @@ -303,7 +295,6 @@ void cmCTestCVS::WriteXMLDirectory(cmXMLWriter& xml, xml.EndElement(); // Directory } -//---------------------------------------------------------------------------- bool cmCTestCVS::WriteXMLUpdates(cmXMLWriter& xml) { cmCTestLog(this->CTest, HANDLER_OUTPUT, diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx index e9f8f39..ea4cf72 100644 --- a/Source/CTest/cmCTestConfigureHandler.cxx +++ b/Source/CTest/cmCTestConfigureHandler.cxx @@ -19,18 +19,15 @@ #include <cmsys/Process.h> -//---------------------------------------------------------------------- cmCTestConfigureHandler::cmCTestConfigureHandler() { } -//---------------------------------------------------------------------- void cmCTestConfigureHandler::Initialize() { this->Superclass::Initialize(); } -//---------------------------------------------------------------------- //clearly it would be nice if this were broken up into a few smaller //functions and commented... int cmCTestConfigureHandler::ProcessHandler() diff --git a/Source/CTest/cmCTestCoverageCommand.cxx b/Source/CTest/cmCTestCoverageCommand.cxx index f1f935b..bf6a321 100644 --- a/Source/CTest/cmCTestCoverageCommand.cxx +++ b/Source/CTest/cmCTestCoverageCommand.cxx @@ -14,13 +14,11 @@ #include "cmCTest.h" #include "cmCTestCoverageHandler.h" -//---------------------------------------------------------------------------- cmCTestCoverageCommand::cmCTestCoverageCommand() { this->LabelsMentioned = false; } -//---------------------------------------------------------------------------- cmCTestGenericHandler* cmCTestCoverageCommand::InitializeHandler() { this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile, @@ -45,7 +43,6 @@ cmCTestGenericHandler* cmCTestCoverageCommand::InitializeHandler() return handler; } -//---------------------------------------------------------------------------- bool cmCTestCoverageCommand::CheckArgumentKeyword(std::string const& arg) { // Look for arguments specific to this command. @@ -60,7 +57,6 @@ bool cmCTestCoverageCommand::CheckArgumentKeyword(std::string const& arg) return this->Superclass::CheckArgumentKeyword(arg); } -//---------------------------------------------------------------------------- bool cmCTestCoverageCommand::CheckArgumentValue(std::string const& arg) { // Handle states specific to this command. diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 79eb346..ed15834 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -132,14 +132,11 @@ private: }; -//---------------------------------------------------------------------- -//---------------------------------------------------------------------- cmCTestCoverageHandler::cmCTestCoverageHandler() { } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::Initialize() { this->Superclass::Initialize(); @@ -151,7 +148,6 @@ void cmCTestCoverageHandler::Initialize() this->LabelFilter.clear(); } -//---------------------------------------------------------------------------- void cmCTestCoverageHandler::CleanCoverageLogFiles(std::ostream& log) { std::string logGlob = this->CTest->GetCTestConfiguration("BuildDirectory"); @@ -169,7 +165,6 @@ void cmCTestCoverageHandler::CleanCoverageLogFiles(std::ostream& log) } } -//---------------------------------------------------------------------- bool cmCTestCoverageHandler::StartCoverageLogFile( cmGeneratedFileStream& covLogFile, int logFileCount) { @@ -187,7 +182,6 @@ bool cmCTestCoverageHandler::StartCoverageLogFile( return true; } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::EndCoverageLogFile(cmGeneratedFileStream& ostr, int logFileCount) { @@ -198,7 +192,6 @@ void cmCTestCoverageHandler::EndCoverageLogFile(cmGeneratedFileStream& ostr, ostr.Close(); } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::StartCoverageLogXML(cmXMLWriter& xml) { this->CTest->StartXML(xml, this->AppendXML); @@ -208,7 +201,6 @@ void cmCTestCoverageHandler::StartCoverageLogXML(cmXMLWriter& xml) static_cast<unsigned int>(cmSystemTools::GetTime())); } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::EndCoverageLogXML(cmXMLWriter& xml) { xml.Element("EndDateTime", this->CTest->CurrentTime()); @@ -217,7 +209,6 @@ void cmCTestCoverageHandler::EndCoverageLogXML(cmXMLWriter& xml) this->CTest->EndXML(xml); } -//---------------------------------------------------------------------- bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file, const char* srcDir, const char* binDir) @@ -322,7 +313,6 @@ bool cmCTestCoverageHandler::ShouldIDoCoverage(const char* file, return true; } -//---------------------------------------------------------------------- //clearly it would be nice if this were broken up into a few smaller //functions and commented... int cmCTestCoverageHandler::ProcessHandler() @@ -747,7 +737,6 @@ int cmCTestCoverageHandler::ProcessHandler() return 0; } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf) { cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, @@ -772,7 +761,6 @@ void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf) } } -//---------------------------------------------------------------------- // Fix for issue #4971 where the case of the drive letter component of // the filenames might be different when analyzing gcov output. // @@ -784,7 +772,6 @@ void cmCTestCoverageHandler::PopulateCustomVectors(cmMakefile *mf) #define fnc(s) s #endif -//---------------------------------------------------------------------- bool IsFileInDir(const std::string &infile, const std::string &indir) { std::string file = cmSystemTools::CollapseFullPath(infile); @@ -802,7 +789,6 @@ bool IsFileInDir(const std::string &infile, const std::string &indir) return false; } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandlePHPCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -815,7 +801,6 @@ int cmCTestCoverageHandler::HandlePHPCoverage( return static_cast<int>(cont->TotalCoverage.size()); } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleCoberturaCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -855,7 +840,6 @@ int cmCTestCoverageHandler::HandleCoberturaCoverage( return static_cast<int>(cont->TotalCoverage.size()); } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleMumpsCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -923,7 +907,6 @@ struct cmCTestCoverageHandlerLocale std::string lc_all; }; -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleJacocoCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -971,7 +954,6 @@ int cmCTestCoverageHandler::HandleJacocoCoverage( return static_cast<int>(cont->TotalCoverage.size()); } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleDelphiCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -1005,7 +987,6 @@ int cmCTestCoverageHandler::HandleDelphiCoverage( return static_cast<int>(cont->TotalCoverage.size()); } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleBlanketJSCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -1051,7 +1032,6 @@ int cmCTestCoverageHandler::HandleBlanketJSCoverage( } return static_cast<int>(cont->TotalCoverage.size()); } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleGCovCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -1493,7 +1473,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage( return file_count; } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleLCovCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -1765,7 +1744,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage( return file_count; } -//---------------------------------------------------------------------------- void cmCTestCoverageHandler::FindGCovFiles(std::vector<std::string>& files) { cmsys::Glob gl; @@ -1796,7 +1774,6 @@ void cmCTestCoverageHandler::FindGCovFiles(std::vector<std::string>& files) } } -//---------------------------------------------------------------------------- bool cmCTestCoverageHandler::FindLCovFiles(std::vector<std::string>& files) { cmsys::Glob gl; @@ -1840,7 +1817,6 @@ bool cmCTestCoverageHandler::FindLCovFiles(std::vector<std::string>& files) return true; } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleTracePyCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -1974,7 +1950,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage( return file_count; } -//---------------------------------------------------------------------- std::string cmCTestCoverageHandler::FindFile( cmCTestCoverageHandlerContainer* cont, std::string fileName) @@ -2014,7 +1989,6 @@ namespace 0}; } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::RunBullseyeCoverageBranch( cmCTestCoverageHandlerContainer* cont, std::set<std::string>& coveredFileNames, @@ -2163,7 +2137,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch( return 1; } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::RunBullseyeCommand( cmCTestCoverageHandlerContainer* cont, const char* cmd, @@ -2213,7 +2186,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand( return 1; } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::RunBullseyeSourceSummary( cmCTestCoverageHandlerContainer* cont) { @@ -2390,7 +2362,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary( coveredFilesFullPath); } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::HandleBullseyeCoverage( cmCTestCoverageHandlerContainer* cont) { @@ -2487,7 +2458,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine( return true; } -//---------------------------------------------------------------------- int cmCTestCoverageHandler::GetLabelId(std::string const& label) { LabelIdMapType::iterator i = this->LabelIdMap.find(label); @@ -2501,7 +2471,6 @@ int cmCTestCoverageHandler::GetLabelId(std::string const& label) return i->second; } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::LoadLabels() { std::string fileList = this->CTest->GetBinaryDir(); @@ -2517,7 +2486,6 @@ void cmCTestCoverageHandler::LoadLabels() } } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::LoadLabels(const char* dir) { LabelSet& dirLabels = this->TargetDirs[dir]; @@ -2572,7 +2540,6 @@ void cmCTestCoverageHandler::LoadLabels(const char* dir) } } -//---------------------------------------------------------------------- void cmCTestCoverageHandler::WriteXMLLabels(cmXMLWriter& xml, std::string const& source) { @@ -2589,7 +2556,6 @@ void cmCTestCoverageHandler::WriteXMLLabels(cmXMLWriter& xml, } } -//---------------------------------------------------------------------------- void cmCTestCoverageHandler::SetLabelFilter(std::set<std::string> const& labels) { @@ -2601,7 +2567,6 @@ cmCTestCoverageHandler::SetLabelFilter(std::set<std::string> const& labels) } } -//---------------------------------------------------------------------- bool cmCTestCoverageHandler::IntersectsFilter(LabelSet const& labels) { // If there is no label filter then nothing is filtered out. @@ -2618,7 +2583,6 @@ bool cmCTestCoverageHandler::IntersectsFilter(LabelSet const& labels) return !ids.empty(); } -//---------------------------------------------------------------------- bool cmCTestCoverageHandler::IsFilteredOut(std::string const& source) { // If there is no label filter then nothing is filtered out. @@ -2638,7 +2602,6 @@ bool cmCTestCoverageHandler::IsFilteredOut(std::string const& source) return true; } -//---------------------------------------------------------------------- std::set<std::string> cmCTestCoverageHandler::FindUncoveredFiles( cmCTestCoverageHandlerContainer* cont) { diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx index 19d869c..6d70be9 100644 --- a/Source/CTest/cmCTestGIT.cxx +++ b/Source/CTest/cmCTestGIT.cxx @@ -23,7 +23,6 @@ #include <sys/types.h> #include <time.h> -//---------------------------------------------------------------------------- static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major, unsigned int minor, unsigned int fix) { @@ -31,7 +30,6 @@ static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major, return fix + minor*1000 + major*100000 + epic*10000000; } -//---------------------------------------------------------------------------- cmCTestGIT::cmCTestGIT(cmCTest* ct, std::ostream& log): cmCTestGlobalVC(ct, log) { @@ -39,12 +37,10 @@ cmCTestGIT::cmCTestGIT(cmCTest* ct, std::ostream& log): this->CurrentGitVersion = 0; } -//---------------------------------------------------------------------------- cmCTestGIT::~cmCTestGIT() { } -//---------------------------------------------------------------------------- class cmCTestGIT::OneLineParser: public cmCTestVC::LineParser { public: @@ -63,7 +59,6 @@ private: } }; -//---------------------------------------------------------------------------- std::string cmCTestGIT::GetWorkingRevision() { // Run plumbing "git rev-list" to get work tree revision. @@ -76,7 +71,6 @@ std::string cmCTestGIT::GetWorkingRevision() return rev; } -//---------------------------------------------------------------------------- void cmCTestGIT::NoteOldRevision() { this->OldRevision = this->GetWorkingRevision(); @@ -85,7 +79,6 @@ void cmCTestGIT::NoteOldRevision() this->PriorRev.Rev = this->OldRevision; } -//---------------------------------------------------------------------------- void cmCTestGIT::NoteNewRevision() { this->NewRevision = this->GetWorkingRevision(); @@ -93,7 +86,6 @@ void cmCTestGIT::NoteNewRevision() << this->NewRevision << "\n"); } -//---------------------------------------------------------------------------- std::string cmCTestGIT::FindGitDir() { std::string git_dir; @@ -141,7 +133,6 @@ std::string cmCTestGIT::FindGitDir() return git_dir; } -//---------------------------------------------------------------------------- std::string cmCTestGIT::FindTopDir() { std::string top_dir = this->SourceDirectory; @@ -162,7 +153,6 @@ std::string cmCTestGIT::FindTopDir() return top_dir; } -//---------------------------------------------------------------------------- bool cmCTestGIT::UpdateByFetchAndReset() { const char* git = this->CommandLineTool.c_str(); @@ -233,7 +223,6 @@ bool cmCTestGIT::UpdateByFetchAndReset() return this->RunChild(&git_reset[0], &reset_out, &reset_err); } -//---------------------------------------------------------------------------- bool cmCTestGIT::UpdateByCustom(std::string const& custom) { std::vector<std::string> git_custom_command; @@ -251,7 +240,6 @@ bool cmCTestGIT::UpdateByCustom(std::string const& custom) return this->RunUpdateCommand(&git_custom[0], &custom_out, &custom_err); } -//---------------------------------------------------------------------------- bool cmCTestGIT::UpdateInternal() { std::string custom = this->CTest->GetCTestConfiguration("GITUpdateCustom"); @@ -262,7 +250,6 @@ bool cmCTestGIT::UpdateInternal() return this->UpdateByFetchAndReset(); } -//---------------------------------------------------------------------------- bool cmCTestGIT::UpdateImpl() { if(!this->UpdateInternal()) @@ -331,7 +318,6 @@ bool cmCTestGIT::UpdateImpl() top_dir.c_str()); } -//---------------------------------------------------------------------------- unsigned int cmCTestGIT::GetGitVersion() { if(!this->CurrentGitVersion) @@ -352,7 +338,6 @@ unsigned int cmCTestGIT::GetGitVersion() return this->CurrentGitVersion; } -//---------------------------------------------------------------------------- /* Diff format: :src-mode dst-mode src-sha1 dst-sha1 status\0 @@ -470,7 +455,6 @@ protected: } }; -//---------------------------------------------------------------------------- /* Commit format: commit ...\n @@ -637,7 +621,6 @@ private: char const cmCTestGIT::CommitParser::SectionSep[SectionCount] = {'\n', '\n', '\0'}; -//---------------------------------------------------------------------------- void cmCTestGIT::LoadRevisions() { // Use 'git rev-list ... | git diff-tree ...' to get revisions. @@ -666,7 +649,6 @@ void cmCTestGIT::LoadRevisions() cmsysProcess_Delete(cp); } -//---------------------------------------------------------------------------- void cmCTestGIT::LoadModifications() { const char* git = this->CommandLineTool.c_str(); diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index 7eccb9c..2e9dd1f 100644 --- a/Source/CTest/cmCTestGenericHandler.cxx +++ b/Source/CTest/cmCTestGenericHandler.cxx @@ -16,7 +16,6 @@ #include "cmCTest.h" -//---------------------------------------------------------------------- cmCTestGenericHandler::cmCTestGenericHandler() { this->HandlerVerbose = cmSystemTools::OUTPUT_NONE; @@ -27,12 +26,10 @@ cmCTestGenericHandler::cmCTestGenericHandler() this->TestLoad = 0; } -//---------------------------------------------------------------------- cmCTestGenericHandler::~cmCTestGenericHandler() { } -//---------------------------------------------------------------------- void cmCTestGenericHandler::SetOption(const std::string& op, const char* value) { if ( !value ) @@ -49,7 +46,6 @@ void cmCTestGenericHandler::SetOption(const std::string& op, const char* value) this->Options[op] = value; } -//---------------------------------------------------------------------- void cmCTestGenericHandler::SetPersistentOption(const std::string& op, const char* value) { @@ -68,7 +64,6 @@ void cmCTestGenericHandler::SetPersistentOption(const std::string& op, this->PersistentOptions[op] = value; } -//---------------------------------------------------------------------- void cmCTestGenericHandler::Initialize() { this->AppendXML = false; @@ -83,7 +78,6 @@ void cmCTestGenericHandler::Initialize() } } -//---------------------------------------------------------------------- const char* cmCTestGenericHandler::GetOption(const std::string& op) { cmCTestGenericHandler::t_StringToString::iterator remit @@ -95,7 +89,6 @@ const char* cmCTestGenericHandler::GetOption(const std::string& op) return remit->second.c_str(); } -//---------------------------------------------------------------------- bool cmCTestGenericHandler::StartResultingXML(cmCTest::Part part, const char* name, cmGeneratedFileStream& xofs) @@ -136,7 +129,6 @@ bool cmCTestGenericHandler::StartResultingXML(cmCTest::Part part, return true; } -//---------------------------------------------------------------------- bool cmCTestGenericHandler::StartLogFile(const char* name, cmGeneratedFileStream& xofs) { diff --git a/Source/CTest/cmCTestGlobalVC.cxx b/Source/CTest/cmCTestGlobalVC.cxx index b66793a..7c565fb 100644 --- a/Source/CTest/cmCTestGlobalVC.cxx +++ b/Source/CTest/cmCTestGlobalVC.cxx @@ -17,25 +17,21 @@ #include <cmsys/RegularExpression.hxx> -//---------------------------------------------------------------------------- cmCTestGlobalVC::cmCTestGlobalVC(cmCTest* ct, std::ostream& log): cmCTestVC(ct, log) { this->PriorRev = this->Unknown; } -//---------------------------------------------------------------------------- cmCTestGlobalVC::~cmCTestGlobalVC() { } -//---------------------------------------------------------------------------- const char* cmCTestGlobalVC::LocalPath(std::string const& path) { return path.c_str(); } -//---------------------------------------------------------------------------- void cmCTestGlobalVC::DoRevision(Revision const& revision, std::vector<Change> const& changes) { @@ -76,7 +72,6 @@ void cmCTestGlobalVC::DoRevision(Revision const& revision, } } -//---------------------------------------------------------------------------- void cmCTestGlobalVC::DoModification(PathStatus status, std::string const& path) { @@ -92,7 +87,6 @@ void cmCTestGlobalVC::DoModification(PathStatus status, } } -//---------------------------------------------------------------------------- void cmCTestGlobalVC::WriteXMLDirectory(cmXMLWriter& xml, std::string const& path, Directory const& dir) @@ -108,7 +102,6 @@ void cmCTestGlobalVC::WriteXMLDirectory(cmXMLWriter& xml, xml.EndElement(); // Directory } -//---------------------------------------------------------------------------- void cmCTestGlobalVC::WriteXMLGlobal(cmXMLWriter& xml) { if(!this->NewRevision.empty()) @@ -121,7 +114,6 @@ void cmCTestGlobalVC::WriteXMLGlobal(cmXMLWriter& xml) } } -//---------------------------------------------------------------------------- bool cmCTestGlobalVC::WriteXMLUpdates(cmXMLWriter& xml) { cmCTestLog(this->CTest, HANDLER_OUTPUT, diff --git a/Source/CTest/cmCTestHG.cxx b/Source/CTest/cmCTestHG.cxx index 0f79d68..4dcd805 100644 --- a/Source/CTest/cmCTestHG.cxx +++ b/Source/CTest/cmCTestHG.cxx @@ -17,19 +17,16 @@ #include <cmsys/RegularExpression.hxx> -//---------------------------------------------------------------------------- cmCTestHG::cmCTestHG(cmCTest* ct, std::ostream& log): cmCTestGlobalVC(ct, log) { this->PriorRev = this->Unknown; } -//---------------------------------------------------------------------------- cmCTestHG::~cmCTestHG() { } -//---------------------------------------------------------------------------- class cmCTestHG::IdentifyParser: public cmCTestVC::LineParser { public: @@ -54,7 +51,6 @@ private: } }; -//---------------------------------------------------------------------------- class cmCTestHG::StatusParser: public cmCTestVC::LineParser { public: @@ -94,7 +90,6 @@ private: } }; -//---------------------------------------------------------------------------- std::string cmCTestHG::GetWorkingRevision() { // Run plumbing "hg identify" to get work tree revision. @@ -107,7 +102,6 @@ std::string cmCTestHG::GetWorkingRevision() return rev; } -//---------------------------------------------------------------------------- void cmCTestHG::NoteOldRevision() { this->OldRevision = this->GetWorkingRevision(); @@ -116,7 +110,6 @@ void cmCTestHG::NoteOldRevision() this->PriorRev.Rev = this->OldRevision; } -//---------------------------------------------------------------------------- void cmCTestHG::NoteNewRevision() { this->NewRevision = this->GetWorkingRevision(); @@ -124,7 +117,6 @@ void cmCTestHG::NoteNewRevision() << this->NewRevision << "\n"); } -//---------------------------------------------------------------------------- bool cmCTestHG::UpdateImpl() { // Use "hg pull" followed by "hg update" to update the working tree. @@ -164,7 +156,6 @@ bool cmCTestHG::UpdateImpl() return this->RunUpdateCommand(&hg_update[0], &out, &err); } -//---------------------------------------------------------------------------- class cmCTestHG::LogParser: public cmCTestVC::OutputLogger, private cmXMLParser { @@ -293,7 +284,6 @@ private: } }; -//---------------------------------------------------------------------------- void cmCTestHG::LoadRevisions() { // Use 'hg log' to get revisions in a xml format. @@ -326,7 +316,6 @@ void cmCTestHG::LoadRevisions() out.Process("</log>\n"); } -//---------------------------------------------------------------------------- void cmCTestHG::LoadModifications() { // Use 'hg status' to get modified files. diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 3579aee..4b24a199 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -158,7 +158,6 @@ bool cmCTestHandlerCommand return true; } -//---------------------------------------------------------------------------- bool cmCTestHandlerCommand::CheckArgumentKeyword(std::string const& arg) { // Look for non-value arguments common to all commands. @@ -188,7 +187,6 @@ bool cmCTestHandlerCommand::CheckArgumentKeyword(std::string const& arg) return false; } -//---------------------------------------------------------------------------- bool cmCTestHandlerCommand::CheckArgumentValue(std::string const& arg) { if(this->ArgumentDoing == ArgumentDoingKeyword) diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 03b06f8..7da81ec 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -27,7 +27,6 @@ #include <stdio.h> // for std{out,err} and fileno #endif -//---------------------------------------------------------------------------- cmCTestLaunch::cmCTestLaunch(int argc, const char* const* argv) { this->Passthru = true; @@ -48,7 +47,6 @@ cmCTestLaunch::cmCTestLaunch(int argc, const char* const* argv) this->Process = cmsysProcess_New(); } -//---------------------------------------------------------------------------- cmCTestLaunch::~cmCTestLaunch() { cmsysProcess_Delete(this->Process); @@ -59,7 +57,6 @@ cmCTestLaunch::~cmCTestLaunch() } } -//---------------------------------------------------------------------------- bool cmCTestLaunch::ParseArguments(int argc, const char* const* argv) { // Launcher options occur first and are separated from the real @@ -171,7 +168,6 @@ bool cmCTestLaunch::ParseArguments(int argc, const char* const* argv) } } -//---------------------------------------------------------------------------- void cmCTestLaunch::HandleRealArg(const char* arg) { #ifdef _WIN32 @@ -190,7 +186,6 @@ void cmCTestLaunch::HandleRealArg(const char* arg) this->RealArgs.push_back(arg); } -//---------------------------------------------------------------------------- void cmCTestLaunch::ComputeFileNames() { // We just passthru the behavior of the real command unless the @@ -234,7 +229,6 @@ void cmCTestLaunch::ComputeFileNames() this->LogErr += "-err.txt"; } -//---------------------------------------------------------------------------- void cmCTestLaunch::RunChild() { // Ignore noopt make rules @@ -302,7 +296,6 @@ void cmCTestLaunch::RunChild() this->ExitCode = cmsysProcess_GetExitValue(cp); } -//---------------------------------------------------------------------------- int cmCTestLaunch::Run() { if(!this->Process) @@ -324,7 +317,6 @@ int cmCTestLaunch::Run() return this->ExitCode; } -//---------------------------------------------------------------------------- void cmCTestLaunch::LoadLabels() { if(this->OptionBuildDir.empty() || this->OptionTargetName.empty()) @@ -379,7 +371,6 @@ void cmCTestLaunch::LoadLabels() } } -//---------------------------------------------------------------------------- bool cmCTestLaunch::SourceMatches(std::string const& lhs, std::string const& rhs) { @@ -390,13 +381,11 @@ bool cmCTestLaunch::SourceMatches(std::string const& lhs, return lhs == rhs; } -//---------------------------------------------------------------------------- bool cmCTestLaunch::IsError() const { return this->ExitCode != 0; } -//---------------------------------------------------------------------------- void cmCTestLaunch::WriteXML() { // Name the xml file. @@ -417,7 +406,6 @@ void cmCTestLaunch::WriteXML() xml.EndElement(); // Failure } -//---------------------------------------------------------------------------- void cmCTestLaunch::WriteXMLAction(cmXMLWriter& xml) { xml.Comment("Meta-information about the build action"); @@ -493,7 +481,6 @@ void cmCTestLaunch::WriteXMLAction(cmXMLWriter& xml) xml.EndElement(); // Action } -//---------------------------------------------------------------------------- void cmCTestLaunch::WriteXMLCommand(cmXMLWriter& xml) { xml.Comment("Details of command"); @@ -510,7 +497,6 @@ void cmCTestLaunch::WriteXMLCommand(cmXMLWriter& xml) xml.EndElement(); // Command } -//---------------------------------------------------------------------------- void cmCTestLaunch::WriteXMLResult(cmXMLWriter& xml) { xml.Comment("Result of command"); @@ -556,7 +542,6 @@ void cmCTestLaunch::WriteXMLResult(cmXMLWriter& xml) xml.EndElement(); // Result } -//---------------------------------------------------------------------------- void cmCTestLaunch::WriteXMLLabels(cmXMLWriter& xml) { this->LoadLabels(); @@ -573,7 +558,6 @@ void cmCTestLaunch::WriteXMLLabels(cmXMLWriter& xml) } } -//---------------------------------------------------------------------------- void cmCTestLaunch::DumpFileToXML(cmXMLWriter& xml, std::string const& fname) { @@ -595,7 +579,6 @@ void cmCTestLaunch::DumpFileToXML(cmXMLWriter& xml, } } -//---------------------------------------------------------------------------- bool cmCTestLaunch::CheckResults() { // Skip XML in passthru mode. @@ -619,7 +602,6 @@ bool cmCTestLaunch::CheckResults() return true; } -//---------------------------------------------------------------------------- void cmCTestLaunch::LoadScrapeRules() { if(this->ScrapeRulesLoaded) @@ -640,7 +622,6 @@ void cmCTestLaunch::LoadScrapeRules() this->LoadScrapeRules("WarningSuppress", this->RegexWarningSuppress); } -//---------------------------------------------------------------------------- void cmCTestLaunch ::LoadScrapeRules(const char* purpose, @@ -662,7 +643,6 @@ cmCTestLaunch } } -//---------------------------------------------------------------------------- bool cmCTestLaunch::ScrapeLog(std::string const& fname) { this->LoadScrapeRules(); @@ -687,7 +667,6 @@ bool cmCTestLaunch::ScrapeLog(std::string const& fname) return false; } -//---------------------------------------------------------------------------- bool cmCTestLaunch::Match(std::string const& line, std::vector<cmsys::RegularExpression>& regexps) { @@ -702,7 +681,6 @@ bool cmCTestLaunch::Match(std::string const& line, return false; } -//---------------------------------------------------------------------------- bool cmCTestLaunch::MatchesFilterPrefix(std::string const& line) const { if(!this->OptionFilterPrefix.empty() && cmSystemTools::StringStartsWith( @@ -713,7 +691,6 @@ bool cmCTestLaunch::MatchesFilterPrefix(std::string const& line) const return false; } -//---------------------------------------------------------------------------- int cmCTestLaunch::Main(int argc, const char* const argv[]) { if(argc == 2) @@ -726,7 +703,6 @@ int cmCTestLaunch::Main(int argc, const char* const argv[]) return self.Run(); } -//---------------------------------------------------------------------------- #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmake.h" diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 9e3ba57..dd2a5b8 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -141,7 +141,6 @@ public: -//---------------------------------------------------------------------- cmCTestMemCheckHandler::cmCTestMemCheckHandler() { this->MemCheck = true; @@ -150,7 +149,6 @@ cmCTestMemCheckHandler::cmCTestMemCheckHandler() this->LogWithPID = false; } -//---------------------------------------------------------------------- void cmCTestMemCheckHandler::Initialize() { this->Superclass::Initialize(); @@ -164,7 +162,6 @@ void cmCTestMemCheckHandler::Initialize() this->MemoryTesterOutputFile = ""; } -//---------------------------------------------------------------------- int cmCTestMemCheckHandler::PreProcessHandler() { if ( !this->InitializeMemoryChecking() ) @@ -181,7 +178,6 @@ int cmCTestMemCheckHandler::PreProcessHandler() return 1; } -//---------------------------------------------------------------------- int cmCTestMemCheckHandler::PostProcessHandler() { if ( !this->ExecuteCommands(this->CustomPostMemCheck) ) @@ -193,7 +189,6 @@ int cmCTestMemCheckHandler::PostProcessHandler() return 1; } -//---------------------------------------------------------------------- void cmCTestMemCheckHandler::GenerateTestCommand( std::vector<std::string>& args, int test) { @@ -256,7 +251,6 @@ void cmCTestMemCheckHandler::GenerateTestCommand( "Memory check command: " << memcheckcommand << std::endl, this->Quiet); } -//---------------------------------------------------------------------- void cmCTestMemCheckHandler::InitializeResultsVectors() { // fill these members @@ -300,7 +294,6 @@ void cmCTestMemCheckHandler::InitializeResultsVectors() "UMR", 0 }; -//---------------------------------------------------------------------- static const char* cmCTestMemCheckResultLongStrings[] = { "Threading Problem", "ABW", @@ -335,7 +328,6 @@ void cmCTestMemCheckHandler::InitializeResultsVectors() } } -//---------------------------------------------------------------------- void cmCTestMemCheckHandler::PopulateCustomVectors(cmMakefile *mf) { this->cmCTestTestHandler::PopulateCustomVectors(mf); @@ -352,7 +344,6 @@ void cmCTestMemCheckHandler::PopulateCustomVectors(cmMakefile *mf) this->Quiet); } -//---------------------------------------------------------------------- void cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml) { if ( !this->CTest->GetProduceXML() ) @@ -483,7 +474,6 @@ void cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml) this->CTest->EndXML(xml); } -//---------------------------------------------------------------------- bool cmCTestMemCheckHandler::InitializeMemoryChecking() { this->MemoryTesterEnvironmentVariable = ""; @@ -747,7 +737,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() return true; } -//---------------------------------------------------------------------- bool cmCTestMemCheckHandler:: ProcessMemCheckOutput(const std::string& str, std::string& log, std::vector<int>& results) @@ -801,7 +790,6 @@ std::vector<int>::size_type cmCTestMemCheckHandler::FindOrAddWarning( this->ResultStringsLong.push_back(warning); return this->ResultStrings.size()-1; } -//---------------------------------------------------------------------- bool cmCTestMemCheckHandler::ProcessMemCheckSanitizerOutput( const std::string& str, std::string& log, std::vector<int>& result) @@ -866,7 +854,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckSanitizerOutput( } return true; } -//---------------------------------------------------------------------- bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput( const std::string& str, std::string& log, std::vector<int>& results) @@ -920,7 +907,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput( return true; } -//---------------------------------------------------------------------- bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput( const std::string& str, std::string& log, std::vector<int>& results) @@ -1095,7 +1081,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput( -//---------------------------------------------------------------------- bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput( const std::string& str, std::string& log, std::vector<int>& results) diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 07c7806..d92ac77 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -94,7 +94,6 @@ void cmCTestMultiProcessHandler::SetTestLoad(unsigned long load) this->TestLoad = load; } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::RunTests() { this->CheckResume(); @@ -121,7 +120,6 @@ void cmCTestMultiProcessHandler::RunTests() this->UpdateCostData(); } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::StartTestProcess(int test) { cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, @@ -177,7 +175,6 @@ void cmCTestMultiProcessHandler::StartTestProcess(int test) cmSystemTools::ChangeDirectory(current_dir); } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::LockResources(int index) { this->LockedResources.insert( @@ -190,7 +187,6 @@ void cmCTestMultiProcessHandler::LockResources(int index) } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::UnlockResources(int index) { for(std::set<std::string>::iterator i = @@ -205,7 +201,6 @@ void cmCTestMultiProcessHandler::UnlockResources(int index) } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::EraseTest(int test) { this->Tests.erase(test); @@ -213,7 +208,6 @@ void cmCTestMultiProcessHandler::EraseTest(int test) std::find(this->SortedTests.begin(), this->SortedTests.end(), test)); } -//--------------------------------------------------------- inline size_t cmCTestMultiProcessHandler::GetProcessorsUsed(int test) { size_t processors = @@ -232,7 +226,6 @@ std::string cmCTestMultiProcessHandler::GetName(int test) return this->Properties[test]->Name; } -//--------------------------------------------------------- bool cmCTestMultiProcessHandler::StartTest(int test) { //Check for locked resources @@ -257,7 +250,6 @@ bool cmCTestMultiProcessHandler::StartTest(int test) return false; } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::StartNextTests() { size_t numToStart = 0; @@ -407,7 +399,6 @@ void cmCTestMultiProcessHandler::StartNextTests() } } -//--------------------------------------------------------- bool cmCTestMultiProcessHandler::CheckOutput() { // no more output we are done @@ -463,7 +454,6 @@ bool cmCTestMultiProcessHandler::CheckOutput() return true; } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::UpdateCostData() { std::string fname = this->CTest->GetCostDataFile(); @@ -527,7 +517,6 @@ void cmCTestMultiProcessHandler::UpdateCostData() cmSystemTools::RenameFile(tmpout.c_str(), fname.c_str()); } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::ReadCostData() { std::string fname = this->CTest->GetCostDataFile(); @@ -579,7 +568,6 @@ void cmCTestMultiProcessHandler::ReadCostData() } } -//--------------------------------------------------------- int cmCTestMultiProcessHandler::SearchByName(std::string name) { int index = -1; @@ -595,7 +583,6 @@ int cmCTestMultiProcessHandler::SearchByName(std::string name) return index; } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::CreateTestCostList() { if(this->ParallelLevel > 1) @@ -608,7 +595,6 @@ void cmCTestMultiProcessHandler::CreateTestCostList() } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::CreateParallelTestCostList() { TestSet alreadySortedTests; @@ -688,7 +674,6 @@ void cmCTestMultiProcessHandler::CreateParallelTestCostList() } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::GetAllTestDependencies( int test, TestList& dependencies) { @@ -701,7 +686,6 @@ void cmCTestMultiProcessHandler::GetAllTestDependencies( } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::CreateSerialTestCostList() { TestList presortedList; @@ -747,7 +731,6 @@ void cmCTestMultiProcessHandler::CreateSerialTestCostList() } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::WriteCheckpoint(int index) { std::string fname = this->CTest->GetBinaryDir() @@ -758,7 +741,6 @@ void cmCTestMultiProcessHandler::WriteCheckpoint(int index) fout.close(); } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::MarkFinished() { std::string fname = this->CTest->GetBinaryDir() @@ -766,7 +748,6 @@ void cmCTestMultiProcessHandler::MarkFinished() cmSystemTools::RemoveFile(fname); } -//--------------------------------------------------------- //For ShowOnly mode void cmCTestMultiProcessHandler::PrintTestList() { @@ -858,7 +839,6 @@ void cmCTestMultiProcessHandler::PrintLabels() } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::CheckResume() { std::string fname = this->CTest->GetBinaryDir() @@ -889,7 +869,6 @@ void cmCTestMultiProcessHandler::CheckResume() } } -//--------------------------------------------------------- void cmCTestMultiProcessHandler::RemoveTest(int index) { this->EraseTest(index); @@ -899,7 +878,6 @@ void cmCTestMultiProcessHandler::RemoveTest(int index) this->Completed++; } -//--------------------------------------------------------- int cmCTestMultiProcessHandler::FindMaxIndex() { int max = 0; diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx index b801cfc..e05b77a 100644 --- a/Source/CTest/cmCTestP4.cxx +++ b/Source/CTest/cmCTestP4.cxx @@ -21,19 +21,16 @@ #include <sys/types.h> #include <time.h> -//---------------------------------------------------------------------------- cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log): cmCTestGlobalVC(ct, log) { this->PriorRev = this->Unknown; } -//---------------------------------------------------------------------------- cmCTestP4::~cmCTestP4() { } -//---------------------------------------------------------------------------- class cmCTestP4::IdentifyParser: public cmCTestVC::LineParser { public: @@ -58,7 +55,6 @@ private: } }; -//---------------------------------------------------------------------------- class cmCTestP4::ChangesParser: public cmCTestVC::LineParser { public: @@ -81,7 +77,6 @@ private: } }; -//---------------------------------------------------------------------------- class cmCTestP4::UserParser: public cmCTestVC::LineParser { public: @@ -112,7 +107,6 @@ private: } }; -//---------------------------------------------------------------------------- /* Diff format: ==== //depot/file#rev - /absolute/path/to/file ==== (diff data) @@ -157,7 +151,6 @@ private: } }; -//---------------------------------------------------------------------------- cmCTestP4::User cmCTestP4::GetUserData(const std::string& username) { std::map<std::string, cmCTestP4::User>::const_iterator it = @@ -188,7 +181,6 @@ cmCTestP4::User cmCTestP4::GetUserData(const std::string& username) return it->second; } -//---------------------------------------------------------------------------- /* Commit format: Change 1111111 by user@client on 2013/09/26 11:50:36 @@ -319,7 +311,6 @@ private: } }; -//---------------------------------------------------------------------------- void cmCTestP4::SetP4Options(std::vector<char const*> &CommandOptions) { if(P4Options.empty()) @@ -358,7 +349,6 @@ void cmCTestP4::SetP4Options(std::vector<char const*> &CommandOptions) } } -//---------------------------------------------------------------------------- std::string cmCTestP4::GetWorkingRevision() { std::vector<char const*> p4_identify; @@ -395,7 +385,6 @@ std::string cmCTestP4::GetWorkingRevision() } } -//---------------------------------------------------------------------------- void cmCTestP4::NoteOldRevision() { this->OldRevision = this->GetWorkingRevision(); @@ -405,7 +394,6 @@ void cmCTestP4::NoteOldRevision() this->PriorRev.Rev = this->OldRevision; } -//---------------------------------------------------------------------------- void cmCTestP4::NoteNewRevision() { this->NewRevision = this->GetWorkingRevision(); @@ -414,7 +402,6 @@ void cmCTestP4::NoteNewRevision() << this->NewRevision << "\n"); } -//---------------------------------------------------------------------------- void cmCTestP4::LoadRevisions() { std::vector<char const*> p4_changes; @@ -465,7 +452,6 @@ void cmCTestP4::LoadRevisions() } } -//---------------------------------------------------------------------------- void cmCTestP4::LoadModifications() { std::vector<char const*> p4_diff; @@ -484,7 +470,6 @@ void cmCTestP4::LoadModifications() this->RunChild(&p4_diff[0], &out, &err); } -//---------------------------------------------------------------------------- bool cmCTestP4::UpdateCustom(const std::string& custom) { std::vector<std::string> p4_custom_command; @@ -504,7 +489,6 @@ bool cmCTestP4::UpdateCustom(const std::string& custom) return this->RunUpdateCommand(&p4_custom[0], &custom_out, &custom_err); } -//---------------------------------------------------------------------------- bool cmCTestP4::UpdateImpl() { std::string custom = this->CTest->GetCTestConfiguration("P4UpdateCustom"); diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 5d159c1..1fa008d 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -43,7 +43,6 @@ cmCTestRunTest::~cmCTestRunTest() { } -//---------------------------------------------------------------------------- bool cmCTestRunTest::CheckOutput() { // Read lines for up to 0.1 seconds of total time. @@ -98,7 +97,6 @@ bool cmCTestRunTest::CheckOutput() return true; } -//--------------------------------------------------------- // Streamed compression of test output. The compressed data // is appended to this->CompressedOutput void cmCTestRunTest::CompressOutput() @@ -161,7 +159,6 @@ void cmCTestRunTest::CompressOutput() delete [] out; } -//--------------------------------------------------------- bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started) { if ((!this->TestHandler->MemCheck && @@ -428,7 +425,6 @@ bool cmCTestRunTest::NeedsToRerun() } return false; } -//---------------------------------------------------------------------- void cmCTestRunTest::ComputeWeightedCost() { double prev = static_cast<double>(this->TestProperties->PreviousRuns); @@ -443,7 +439,6 @@ void cmCTestRunTest::ComputeWeightedCost() } } -//---------------------------------------------------------------------- void cmCTestRunTest::MemCheckPostProcess() { if(!this->TestHandler->MemCheck) @@ -460,7 +455,6 @@ void cmCTestRunTest::MemCheckPostProcess() handler->PostProcessTest(this->TestResult, this->Index); } -//---------------------------------------------------------------------- // Starts the execution of a test. Returns once it has started bool cmCTestRunTest::StartTest(size_t total) { @@ -556,7 +550,6 @@ bool cmCTestRunTest::StartTest(size_t total) &this->TestProperties->Environment); } -//---------------------------------------------------------------------- void cmCTestRunTest::ComputeArguments() { this->Arguments.clear(); // reset becaue this might be a rerun @@ -623,7 +616,6 @@ void cmCTestRunTest::ComputeArguments() } } -//---------------------------------------------------------------------- void cmCTestRunTest::DartProcessing() { if (!this->ProcessOutput.empty() && @@ -643,7 +635,6 @@ void cmCTestRunTest::DartProcessing() } } -//---------------------------------------------------------------------- double cmCTestRunTest::ResolveTimeout() { double timeout = this->TestProperties->Timeout; @@ -708,7 +699,6 @@ double cmCTestRunTest::ResolveTimeout() (timeout < stop_timeout ? timeout : stop_timeout); } -//---------------------------------------------------------------------- bool cmCTestRunTest::ForkProcess(double testTimeOut, bool explicitTimeout, std::vector<std::string>* environment) { diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx index f7bd1f9..507ec29 100644 --- a/Source/CTest/cmCTestSVN.cxx +++ b/Source/CTest/cmCTestSVN.cxx @@ -23,19 +23,16 @@ struct cmCTestSVN::Revision: public cmCTestVC::Revision cmCTestSVN::SVNInfo* SVNInfo; }; -//---------------------------------------------------------------------------- cmCTestSVN::cmCTestSVN(cmCTest* ct, std::ostream& log): cmCTestGlobalVC(ct, log) { this->PriorRev = this->Unknown; } -//---------------------------------------------------------------------------- cmCTestSVN::~cmCTestSVN() { } -//---------------------------------------------------------------------------- void cmCTestSVN::CleanupImpl() { std::vector<const char*> svn_cleanup; @@ -45,7 +42,6 @@ void cmCTestSVN::CleanupImpl() this->RunSVNCommand(svn_cleanup, &out, &err); } -//---------------------------------------------------------------------------- class cmCTestSVN::InfoParser: public cmCTestVC::LineParser { public: @@ -84,7 +80,6 @@ private: } }; -//---------------------------------------------------------------------------- static bool cmCTestSVNPathStarts(std::string const& p1, std::string const& p2) { // Does path p1 start with path p2? @@ -102,7 +97,6 @@ static bool cmCTestSVNPathStarts(std::string const& p1, std::string const& p2) } } -//---------------------------------------------------------------------------- std::string cmCTestSVN::LoadInfo(SVNInfo& svninfo) { // Run "svn info" to get the repository info from the work tree. @@ -116,7 +110,6 @@ std::string cmCTestSVN::LoadInfo(SVNInfo& svninfo) return rev; } -//---------------------------------------------------------------------------- void cmCTestSVN::NoteOldRevision() { // Info for root repository @@ -145,7 +138,6 @@ void cmCTestSVN::NoteOldRevision() this->PriorRev.Rev = this->OldRevision; } -//---------------------------------------------------------------------------- void cmCTestSVN::NoteNewRevision() { // Get info for the external repositories @@ -186,7 +178,6 @@ void cmCTestSVN::NoteNewRevision() this->NewRevision = this->RootInfo->NewRevision; } -//---------------------------------------------------------------------------- void cmCTestSVN::GuessBase(SVNInfo& svninfo, std::vector<Change> const& changes) { @@ -220,7 +211,6 @@ void cmCTestSVN::GuessBase(SVNInfo& svninfo, this->Log << "Guessed Base = " << svninfo.Base << "\n"; } -//---------------------------------------------------------------------------- class cmCTestSVN::UpdateParser: public cmCTestVC::LineParser { public: @@ -268,7 +258,6 @@ private: } }; -//---------------------------------------------------------------------------- bool cmCTestSVN::UpdateImpl() { // Get user-specified update options. @@ -298,7 +287,6 @@ bool cmCTestSVN::UpdateImpl() return this->RunSVNCommand(svn_update, &out, &err); } -//---------------------------------------------------------------------------- bool cmCTestSVN::RunSVNCommand(std::vector<char const*> const& parameters, OutputParser* out, OutputParser* err) { @@ -334,7 +322,6 @@ bool cmCTestSVN::RunSVNCommand(std::vector<char const*> const& parameters, } } -//---------------------------------------------------------------------------- class cmCTestSVN::LogParser: public cmCTestVC::OutputLogger, private cmXMLParser { @@ -423,7 +410,6 @@ private: } }; -//---------------------------------------------------------------------------- void cmCTestSVN::LoadRevisions() { // Get revisions for all the external repositories @@ -436,7 +422,6 @@ void cmCTestSVN::LoadRevisions() } } -//---------------------------------------------------------------------------- void cmCTestSVN::LoadRevisions(SVNInfo &svninfo) { // We are interested in every revision included in the update. @@ -462,7 +447,6 @@ void cmCTestSVN::LoadRevisions(SVNInfo &svninfo) this->RunSVNCommand(svn_log, &out, &err); } -//---------------------------------------------------------------------------- void cmCTestSVN::DoRevisionSVN(Revision const& revision, std::vector<Change> const& changes) { @@ -482,7 +466,6 @@ void cmCTestSVN::DoRevisionSVN(Revision const& revision, this->cmCTestGlobalVC::DoRevision(revision, changes); } -//---------------------------------------------------------------------------- class cmCTestSVN::StatusParser: public cmCTestVC::LineParser { public: @@ -523,7 +506,6 @@ private: } }; -//---------------------------------------------------------------------------- void cmCTestSVN::LoadModifications() { // Run "svn status" which reports local modifications. @@ -534,7 +516,6 @@ void cmCTestSVN::LoadModifications() this->RunSVNCommand(svn_status, &out, &err); } -//---------------------------------------------------------------------------- void cmCTestSVN::WriteXMLGlobal(cmXMLWriter& xml) { this->cmCTestGlobalVC::WriteXMLGlobal(xml); @@ -542,7 +523,6 @@ void cmCTestSVN::WriteXMLGlobal(cmXMLWriter& xml) xml.Element("SVNPath", this->RootInfo->Base); } -//---------------------------------------------------------------------------- class cmCTestSVN::ExternalParser: public cmCTestVC::LineParser { public: @@ -581,7 +561,6 @@ private: } }; -//---------------------------------------------------------------------------- void cmCTestSVN::LoadExternals() { // Run "svn status" to get the list of external repositories @@ -592,7 +571,6 @@ void cmCTestSVN::LoadExternals() this->RunSVNCommand(svn_status, &out, &err); } -//---------------------------------------------------------------------------- std::string cmCTestSVN::SVNInfo::BuildLocalPath(std::string const& path) const { std::string local_path; diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 4485d34..bde7a6d 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -78,7 +78,6 @@ IsFunctionBlocked(const cmListFileFunction& , cmMakefile &, return false; } -//---------------------------------------------------------------------- cmCTestScriptHandler::cmCTestScriptHandler() { this->Backup = false; @@ -95,7 +94,6 @@ cmCTestScriptHandler::cmCTestScriptHandler() this->ContinuousDuration = -1; } -//---------------------------------------------------------------------- void cmCTestScriptHandler::Initialize() { this->Superclass::Initialize(); @@ -132,7 +130,6 @@ void cmCTestScriptHandler::Initialize() delete this->CMake; } -//---------------------------------------------------------------------- cmCTestScriptHandler::~cmCTestScriptHandler() { delete this->Makefile; @@ -141,7 +138,6 @@ cmCTestScriptHandler::~cmCTestScriptHandler() } -//---------------------------------------------------------------------- // just adds an argument to the vector void cmCTestScriptHandler::AddConfigurationScript(const char *script, bool pscope) @@ -151,7 +147,6 @@ void cmCTestScriptHandler::AddConfigurationScript(const char *script, } -//---------------------------------------------------------------------- // the generic entry point for handling scripts, this routine will run all // the scripts provides a -S arguments int cmCTestScriptHandler::ProcessHandler() @@ -184,7 +179,6 @@ void cmCTestScriptHandler::UpdateElapsedTime() } } -//---------------------------------------------------------------------- void cmCTestScriptHandler::AddCTestCommand(cmCTestCommand* command) { cmCTestCommand* newCom = command; @@ -348,7 +342,6 @@ void cmCTestScriptHandler::CreateCMake() this->AddCTestCommand(new cmCTestUploadCommand); } -//---------------------------------------------------------------------- // this sets up some variables for the script to use, creates the required // cmake instance and generators, and then reads in the script int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg) @@ -443,7 +436,6 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg) } -//---------------------------------------------------------------------- // extract variabels from the script to set ivars int cmCTestScriptHandler::ExtractVariables() { @@ -560,7 +552,6 @@ int cmCTestScriptHandler::ExtractVariables() return 0; } -//---------------------------------------------------------------------- void cmCTestScriptHandler::SleepInSeconds(unsigned int secondsToWait) { #if defined(_WIN32) @@ -570,7 +561,6 @@ void cmCTestScriptHandler::SleepInSeconds(unsigned int secondsToWait) #endif } -//---------------------------------------------------------------------- // run a specific script int cmCTestScriptHandler::RunConfigurationScript (const std::string& total_script_arg, bool pscope) @@ -610,7 +600,6 @@ int cmCTestScriptHandler::RunConfigurationScript return result; } -//---------------------------------------------------------------------- int cmCTestScriptHandler::RunCurrentScript() { int result; @@ -673,7 +662,6 @@ int cmCTestScriptHandler::RunCurrentScript() return result; } -//---------------------------------------------------------------------- int cmCTestScriptHandler::CheckOutSourceDir() { std::string command; @@ -702,7 +690,6 @@ int cmCTestScriptHandler::CheckOutSourceDir() return 0; } -//---------------------------------------------------------------------- int cmCTestScriptHandler::BackupDirectories() { int retVal; @@ -743,7 +730,6 @@ int cmCTestScriptHandler::BackupDirectories() } -//---------------------------------------------------------------------- int cmCTestScriptHandler::PerformExtraUpdates() { std::string command; @@ -786,7 +772,6 @@ int cmCTestScriptHandler::PerformExtraUpdates() } -//---------------------------------------------------------------------- // run a single dashboard entry int cmCTestScriptHandler::RunConfigurationDashboard() { @@ -977,7 +962,6 @@ int cmCTestScriptHandler::RunConfigurationDashboard() return 0; } -//------------------------------------------------------------------------- bool cmCTestScriptHandler::WriteInitialCache(const char* directory, const char* text) { @@ -1002,7 +986,6 @@ bool cmCTestScriptHandler::WriteInitialCache(const char* directory, return true; } -//------------------------------------------------------------------------- void cmCTestScriptHandler::RestoreBackupDirectories() { // if we backed up the dirs and the build failed, then restore @@ -1074,7 +1057,6 @@ bool cmCTestScriptHandler::EmptyBinaryDirectory(const char *sname) return false; } -//------------------------------------------------------------------------- bool cmCTestScriptHandler::TryToRemoveBinaryDirectoryOnce( const std::string& directoryPath) { @@ -1114,7 +1096,6 @@ bool cmCTestScriptHandler::TryToRemoveBinaryDirectoryOnce( return cmSystemTools::RemoveADirectory(directoryPath); } -//------------------------------------------------------------------------- double cmCTestScriptHandler::GetRemainingTimeAllowed() { if (!this->Makefile) diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 4a38dc6..fef5637 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -154,7 +154,6 @@ bool cmCTestStartCommand return this->CTest->InitializeFromCommand(this); } -//---------------------------------------------------------------------------- bool cmCTestStartCommand::InitialCheckout( std::ostream& ofs, std::string const& sourceDir) { diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index 5a8090c..6174624 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -161,7 +161,6 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler() return handler; } -//---------------------------------------------------------------------------- bool cmCTestSubmitCommand::InitialPass(std::vector<std::string> const& args, cmExecutionStatus& status) { @@ -169,7 +168,6 @@ bool cmCTestSubmitCommand::InitialPass(std::vector<std::string> const& args, return this->cmCTestHandlerCommand::InitialPass(args, status); } -//---------------------------------------------------------------------------- bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg) { if (this->CDashUpload) @@ -227,7 +225,6 @@ bool cmCTestSubmitCommand::CheckArgumentKeyword(std::string const& arg) } -//---------------------------------------------------------------------------- bool cmCTestSubmitCommand::CheckArgumentValue(std::string const& arg) { // Handle states specific to this command. diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 8621577..2153b8f 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -37,7 +37,6 @@ typedef std::vector<char> cmCTestSubmitHandlerVectorOfChar; -//---------------------------------------------------------------------------- class cmCTestSubmitHandler::ResponseParser: public cmXMLParser { public: @@ -146,13 +145,11 @@ cmCTestSubmitHandlerCurlDebugCallback(CURL *, curl_infotype, char *chPtr, return size; } -//---------------------------------------------------------------------------- cmCTestSubmitHandler::cmCTestSubmitHandler() : HTTPProxy(), FTPProxy() { this->Initialize(); } -//---------------------------------------------------------------------------- void cmCTestSubmitHandler::Initialize() { // We submit all available parts by default. @@ -174,7 +171,6 @@ void cmCTestSubmitHandler::Initialize() this->Files.clear(); } -//---------------------------------------------------------------------------- bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix, const std::set<std::string>& files, const std::string& remoteprefix, @@ -328,7 +324,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix, return true; } -//---------------------------------------------------------------------------- // Uploading files is simpler bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, const std::set<std::string>& files, @@ -643,7 +638,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, return true; } -//---------------------------------------------------------------------------- void cmCTestSubmitHandler ::ParseResponse(cmCTestSubmitHandlerVectorOfChar chunk) { @@ -680,7 +674,6 @@ void cmCTestSubmitHandler } } -//---------------------------------------------------------------------------- bool cmCTestSubmitHandler::TriggerUsingHTTP( const std::set<std::string>& files, const std::string& remoteprefix, @@ -821,7 +814,6 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP( return true; } -//---------------------------------------------------------------------------- bool cmCTestSubmitHandler::SubmitUsingSCP( const std::string& scp_command, const std::string& localprefix, @@ -923,7 +915,6 @@ bool cmCTestSubmitHandler::SubmitUsingSCP( return true; } -//---------------------------------------------------------------------------- bool cmCTestSubmitHandler::SubmitUsingCP( const std::string& localprefix, const std::set<std::string>& files, @@ -967,7 +958,6 @@ bool cmCTestSubmitHandler::SubmitUsingCP( } -//---------------------------------------------------------------------------- #if defined(CTEST_USE_XMLRPC) bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix, const std::set<std::string>& files, @@ -1238,7 +1228,6 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file, return 0; } -//---------------------------------------------------------------------------- int cmCTestSubmitHandler::ProcessHandler() { const char* cdashUploadFile = this->GetOption("CDashUploadFile"); @@ -1664,7 +1653,6 @@ int cmCTestSubmitHandler::ProcessHandler() return -1; } -//---------------------------------------------------------------------------- std::string cmCTestSubmitHandler::GetSubmitResultsPrefix() { std::string buildname = cmCTest::SafeBuildIdField( @@ -1676,7 +1664,6 @@ std::string cmCTestSubmitHandler::GetSubmitResultsPrefix() return name; } -//---------------------------------------------------------------------------- void cmCTestSubmitHandler::SelectParts(std::set<cmCTest::Part> const& parts) { // Check whether each part is selected. @@ -1688,7 +1675,6 @@ void cmCTestSubmitHandler::SelectParts(std::set<cmCTest::Part> const& parts) } } -//---------------------------------------------------------------------------- void cmCTestSubmitHandler::SelectFiles(cmCTest::SetOfStrings const& files) { this->Files.insert(files.begin(), files.end()); diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index d8229da..b477f5f 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -36,7 +36,6 @@ #include <set> -//---------------------------------------------------------------------- class cmCTestSubdirCommand : public cmCommand { public: @@ -67,7 +66,6 @@ public: cmCTestTestHandler* TestHandler; }; -//---------------------------------------------------------------------- bool cmCTestSubdirCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -131,7 +129,6 @@ bool cmCTestSubdirCommand return true; } -//---------------------------------------------------------------------- class cmCTestAddSubdirectoryCommand : public cmCommand { public: @@ -162,7 +159,6 @@ public: cmCTestTestHandler* TestHandler; }; -//---------------------------------------------------------------------- bool cmCTestAddSubdirectoryCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -215,7 +211,6 @@ bool cmCTestAddSubdirectoryCommand return true; } -//---------------------------------------------------------------------- class cmCTestAddTestCommand : public cmCommand { public: @@ -246,7 +241,6 @@ public: cmCTestTestHandler* TestHandler; }; -//---------------------------------------------------------------------- bool cmCTestAddTestCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -258,7 +252,6 @@ bool cmCTestAddTestCommand return this->TestHandler->AddTest(args); } -//---------------------------------------------------------------------- class cmCTestSetTestsPropertiesCommand : public cmCommand { public: @@ -290,14 +283,12 @@ public: cmCTestTestHandler* TestHandler; }; -//---------------------------------------------------------------------- bool cmCTestSetTestsPropertiesCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { return this->TestHandler->SetTestsProperties(args); } -//---------------------------------------------------------------------- // get the next number in a string with numbers separated by , // pos is the start of the search and pos2 is the end of the search // pos becomes pos2 after a call to GetNextNumber. @@ -335,7 +326,6 @@ inline int GetNextNumber(std::string const& in, } } -//---------------------------------------------------------------------- // get the next number in a string with numbers separated by , // pos is the start of the search and pos2 is the end of the search // pos becomes pos2 after a call to GetNextNumber. @@ -374,7 +364,6 @@ inline int GetNextRealNumber(std::string const& in, } -//---------------------------------------------------------------------- cmCTestTestHandler::cmCTestTestHandler() { this->UseUnion = false; @@ -400,7 +389,6 @@ cmCTestTestHandler::cmCTestTestHandler() "(<DartMeasurement[^<]*</DartMeasurement[a-zA-Z]*>)"); } -//---------------------------------------------------------------------- void cmCTestTestHandler::Initialize() { this->Superclass::Initialize(); @@ -435,7 +423,6 @@ void cmCTestTestHandler::Initialize() this->TestList.clear(); } -//---------------------------------------------------------------------- void cmCTestTestHandler::PopulateCustomVectors(cmMakefile *mf) { this->CTest->PopulateCustomVector(mf, "CTEST_CUSTOM_PRE_TEST", @@ -453,7 +440,6 @@ void cmCTestTestHandler::PopulateCustomVectors(cmMakefile *mf) this->CustomMaximumFailedTestOutputSize); } -//---------------------------------------------------------------------- int cmCTestTestHandler::PreProcessHandler() { if ( !this->ExecuteCommands(this->CustomPreTest) ) @@ -465,7 +451,6 @@ int cmCTestTestHandler::PreProcessHandler() return 1; } -//---------------------------------------------------------------------- int cmCTestTestHandler::PostProcessHandler() { if ( !this->ExecuteCommands(this->CustomPostTest) ) @@ -477,7 +462,6 @@ int cmCTestTestHandler::PostProcessHandler() return 1; } -//---------------------------------------------------------------------- //clearly it would be nice if this were broken up into a few smaller //functions and commented... int cmCTestTestHandler::ProcessHandler() @@ -652,7 +636,6 @@ int cmCTestTestHandler::ProcessHandler() return 0; } -//---------------------------------------------------------------------- void cmCTestTestHandler::PrintLabelSummary() { cmCTestTestHandler::ListOfTests::iterator it = this->TestList.begin(); @@ -739,7 +722,6 @@ void cmCTestTestHandler::PrintLabelSummary() } -//---------------------------------------------------------------------- void cmCTestTestHandler::CheckLabelFilterInclude(cmCTestTestProperties& it) { // if not using Labels to filter then return @@ -773,7 +755,6 @@ void cmCTestTestHandler::CheckLabelFilterInclude(cmCTestTestProperties& it) } -//---------------------------------------------------------------------- void cmCTestTestHandler::CheckLabelFilterExclude(cmCTestTestProperties& it) { // if not using Labels to filter then return @@ -805,14 +786,12 @@ void cmCTestTestHandler::CheckLabelFilterExclude(cmCTestTestProperties& it) } } -//---------------------------------------------------------------------- void cmCTestTestHandler::CheckLabelFilter(cmCTestTestProperties& it) { this->CheckLabelFilterInclude(it); this->CheckLabelFilterExclude(it); } -//---------------------------------------------------------------------- void cmCTestTestHandler::ComputeTestList() { this->TestList.clear(); // clear list of test @@ -1060,7 +1039,6 @@ bool cmCTestTestHandler::GetValue(const char* tag, return ret; } -//--------------------------------------------------------------------- void cmCTestTestHandler::ProcessDirectory(std::vector<std::string> &passed, std::vector<std::string> &failed) { @@ -1158,12 +1136,10 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string> &passed, << this->CTest->CurrentTime() << std::endl; } -//---------------------------------------------------------------------- void cmCTestTestHandler::GenerateTestCommand(std::vector<std::string>&, int) { } -//---------------------------------------------------------------------- void cmCTestTestHandler::GenerateDartOutput(cmXMLWriter& xml) { if ( !this->CTest->GetProduceXML() ) @@ -1271,7 +1247,6 @@ void cmCTestTestHandler::GenerateDartOutput(cmXMLWriter& xml) this->CTest->EndXML(xml); } -//---------------------------------------------------------------------------- void cmCTestTestHandler::WriteTestResultHeader(cmXMLWriter& xml, cmCTestTestResult* result) { @@ -1295,7 +1270,6 @@ void cmCTestTestHandler::WriteTestResultHeader(cmXMLWriter& xml, xml.Element("FullCommandLine", result->FullCommandLine); } -//---------------------------------------------------------------------------- void cmCTestTestHandler::WriteTestResultFooter(cmXMLWriter& xml, cmCTestTestResult* result) { @@ -1314,7 +1288,6 @@ void cmCTestTestHandler::WriteTestResultFooter(cmXMLWriter& xml, xml.EndElement(); // Test } -//---------------------------------------------------------------------- void cmCTestTestHandler::AttachFiles(cmXMLWriter& xml, cmCTestTestResult* result) { @@ -1343,7 +1316,6 @@ void cmCTestTestHandler::AttachFiles(cmXMLWriter& xml, } } -//---------------------------------------------------------------------- int cmCTestTestHandler::ExecuteCommands(std::vector<std::string>& vec) { std::vector<std::string>::iterator it; @@ -1365,7 +1337,6 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<std::string>& vec) } -//---------------------------------------------------------------------- // Find the appropriate executable to run for a test std::string cmCTestTestHandler::FindTheExecutable(const char *exe) { @@ -1455,7 +1426,6 @@ void cmCTestTestHandler } -//---------------------------------------------------------------------- // Find the appropriate executable to run for a test std::string cmCTestTestHandler ::FindExecutable(cmCTest *ctest, @@ -1565,7 +1535,6 @@ std::string cmCTestTestHandler } -//---------------------------------------------------------------------- void cmCTestTestHandler::GetListOfTests() { if ( !this->IncludeLabelRegExp.empty() ) @@ -1648,20 +1617,17 @@ void cmCTestTestHandler::GetListOfTests() "Done constructing a list of tests" << std::endl, this->Quiet); } -//---------------------------------------------------------------------- void cmCTestTestHandler::UseIncludeRegExp() { this->UseIncludeRegExpFlag = true; } -//---------------------------------------------------------------------- void cmCTestTestHandler::UseExcludeRegExp() { this->UseExcludeRegExpFlag = true; this->UseExcludeRegExpFirst = this->UseIncludeRegExpFlag ? false : true; } -//---------------------------------------------------------------------- const char* cmCTestTestHandler::GetTestStatus(int status) { static const char statuses[][100] = { @@ -1685,7 +1651,6 @@ const char* cmCTestTestHandler::GetTestStatus(int status) return statuses[status]; } -//---------------------------------------------------------------------- void cmCTestTestHandler::ExpandTestsToRunInformation(size_t numTests) { if (this->TestsToRunString.empty()) @@ -1841,10 +1806,8 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed() } } -//---------------------------------------------------------------------- // Just for convenience #define SPACE_REGEX "[ \t\r\n]" -//---------------------------------------------------------------------- void cmCTestTestHandler::GenerateRegressionImages( cmXMLWriter& xml, const std::string& dart) { @@ -2031,19 +1994,16 @@ void cmCTestTestHandler::GenerateRegressionImages( } } -//---------------------------------------------------------------------- void cmCTestTestHandler::SetIncludeRegExp(const char *arg) { this->IncludeRegExp = arg; } -//---------------------------------------------------------------------- void cmCTestTestHandler::SetExcludeRegExp(const char *arg) { this->ExcludeRegExp = arg; } -//---------------------------------------------------------------------- void cmCTestTestHandler::SetTestsToRunInformation(const char* in) { if ( !in ) @@ -2065,7 +2025,6 @@ void cmCTestTestHandler::SetTestsToRunInformation(const char* in) } } -//---------------------------------------------------------------------------- bool cmCTestTestHandler::CleanTestOutput(std::string& output, size_t length) { if(!length || length >= output.size() || @@ -2107,7 +2066,6 @@ bool cmCTestTestHandler::CleanTestOutput(std::string& output, size_t length) return true; } -//---------------------------------------------------------------------- bool cmCTestTestHandler::SetTestsProperties( const std::vector<std::string>& args) { @@ -2287,7 +2245,6 @@ bool cmCTestTestHandler::SetTestsProperties( return true; } -//---------------------------------------------------------------------- bool cmCTestTestHandler::AddTest(const std::vector<std::string>& args) { const std::string& testname = args[0]; diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index b1b0a21..85624e0 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -44,7 +44,6 @@ #include <math.h> #include <stdlib.h> -//---------------------------------------------------------------------- static const char* cmCTestUpdateHandlerUpdateStrings[] = { "Unknown", @@ -66,12 +65,10 @@ static const char* cmCTestUpdateHandlerUpdateToString(int type) return cmCTestUpdateHandlerUpdateStrings[type]; } -//---------------------------------------------------------------------- cmCTestUpdateHandler::cmCTestUpdateHandler() { } -//---------------------------------------------------------------------- void cmCTestUpdateHandler::Initialize() { this->Superclass::Initialize(); @@ -79,7 +76,6 @@ void cmCTestUpdateHandler::Initialize() this->UpdateType = e_CVS; } -//---------------------------------------------------------------------- int cmCTestUpdateHandler::DetermineType(const char* cmd, const char* type) { cmCTestOptionalLog(this->CTest, DEBUG, @@ -148,7 +144,6 @@ int cmCTestUpdateHandler::DetermineType(const char* cmd, const char* type) return cmCTestUpdateHandler::e_UNKNOWN; } -//---------------------------------------------------------------------- //clearly it would be nice if this were broken up into a few smaller //functions and commented... int cmCTestUpdateHandler::ProcessHandler() @@ -291,7 +286,6 @@ int cmCTestUpdateHandler::ProcessHandler() return updated? numUpdated : -1; } -//---------------------------------------------------------------------- int cmCTestUpdateHandler::DetectVCS(const char* dir) { std::string sourceDirectory = dir; @@ -341,7 +335,6 @@ int cmCTestUpdateHandler::DetectVCS(const char* dir) return cmCTestUpdateHandler::e_UNKNOWN; } -//---------------------------------------------------------------------- bool cmCTestUpdateHandler::SelectVCS() { // Get update command diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx index f5000dd..7c24e62 100644 --- a/Source/CTest/cmCTestUploadCommand.cxx +++ b/Source/CTest/cmCTestUploadCommand.cxx @@ -31,7 +31,6 @@ cmCTestGenericHandler* cmCTestUploadCommand::InitializeHandler() } -//---------------------------------------------------------------------------- bool cmCTestUploadCommand::CheckArgumentKeyword(std::string const& arg) { if(arg == "FILES") @@ -49,7 +48,6 @@ bool cmCTestUploadCommand::CheckArgumentKeyword(std::string const& arg) } -//---------------------------------------------------------------------------- bool cmCTestUploadCommand::CheckArgumentValue(std::string const& arg) { if(this->ArgumentDoing == ArgumentDoingFiles) diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx index 5c6b229..6f0a024 100644 --- a/Source/CTest/cmCTestUploadHandler.cxx +++ b/Source/CTest/cmCTestUploadHandler.cxx @@ -15,13 +15,11 @@ #include "cmVersion.h" #include "cmXMLWriter.h" -//---------------------------------------------------------------------------- cmCTestUploadHandler::cmCTestUploadHandler() { this->Initialize(); } -//---------------------------------------------------------------------------- void cmCTestUploadHandler::Initialize() { this->Superclass::Initialize(); @@ -33,7 +31,6 @@ void cmCTestUploadHandler::SetFiles(const cmCTest::SetOfStrings& files) this->Files = files; } -//---------------------------------------------------------------------------- int cmCTestUploadHandler::ProcessHandler() { cmGeneratedFileStream ofs; diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx index 8eff4d6..f3d699b 100644 --- a/Source/CTest/cmCTestVC.cxx +++ b/Source/CTest/cmCTestVC.cxx @@ -17,7 +17,6 @@ #include <cmsys/Process.h> -//---------------------------------------------------------------------------- cmCTestVC::cmCTestVC(cmCTest* ct, std::ostream& log): CTest(ct), Log(log) { this->PathCount[PathUpdated] = 0; @@ -28,24 +27,20 @@ cmCTestVC::cmCTestVC(cmCTest* ct, std::ostream& log): CTest(ct), Log(log) this->Unknown.Rev = "Unknown"; } -//---------------------------------------------------------------------------- cmCTestVC::~cmCTestVC() { } -//---------------------------------------------------------------------------- void cmCTestVC::SetCommandLineTool(std::string const& tool) { this->CommandLineTool = tool; } -//---------------------------------------------------------------------------- void cmCTestVC::SetSourceDirectory(std::string const& dir) { this->SourceDirectory = dir; } -//---------------------------------------------------------------------------- bool cmCTestVC::InitialCheckout(const char* command) { cmCTestLog(this->CTest, HANDLER_OUTPUT, @@ -86,7 +81,6 @@ bool cmCTestVC::InitialCheckout(const char* command) return result; } -//---------------------------------------------------------------------------- bool cmCTestVC::RunChild(char const* const* cmd, OutputParser* out, OutputParser* err, const char* workDir) { @@ -102,7 +96,6 @@ bool cmCTestVC::RunChild(char const* const* cmd, OutputParser* out, return result == 0; } -//---------------------------------------------------------------------------- std::string cmCTestVC::ComputeCommandLine(char const* const* cmd) { std::ostringstream line; @@ -115,7 +108,6 @@ std::string cmCTestVC::ComputeCommandLine(char const* const* cmd) return line.str(); } -//---------------------------------------------------------------------------- bool cmCTestVC::RunUpdateCommand(char const* const* cmd, OutputParser* out, OutputParser* err) { @@ -131,7 +123,6 @@ bool cmCTestVC::RunUpdateCommand(char const* const* cmd, return this->RunChild(cmd, out, err); } -//---------------------------------------------------------------------------- std::string cmCTestVC::GetNightlyTime() { // Get the nightly start time corresponding to the current dau. @@ -149,7 +140,6 @@ std::string cmCTestVC::GetNightlyTime() return std::string(current_time); } -//---------------------------------------------------------------------------- void cmCTestVC::Cleanup() { this->Log << "--- Begin Cleanup ---\n"; @@ -157,13 +147,11 @@ void cmCTestVC::Cleanup() this->Log << "--- End Cleanup ---\n"; } -//---------------------------------------------------------------------------- void cmCTestVC::CleanupImpl() { // We do no cleanup by default. } -//---------------------------------------------------------------------------- bool cmCTestVC::Update() { bool result = true; @@ -181,19 +169,16 @@ bool cmCTestVC::Update() return result; } -//---------------------------------------------------------------------------- void cmCTestVC::NoteOldRevision() { // We do nothing by default. } -//---------------------------------------------------------------------------- void cmCTestVC::NoteNewRevision() { // We do nothing by default. } -//---------------------------------------------------------------------------- bool cmCTestVC::UpdateImpl() { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, @@ -201,7 +186,6 @@ bool cmCTestVC::UpdateImpl() return true; } -//---------------------------------------------------------------------------- bool cmCTestVC::WriteXML(cmXMLWriter& xml) { this->Log << "--- Begin Revisions ---\n"; @@ -210,7 +194,6 @@ bool cmCTestVC::WriteXML(cmXMLWriter& xml) return result; } -//---------------------------------------------------------------------------- bool cmCTestVC::WriteXMLUpdates(cmXMLWriter&) { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, @@ -218,7 +201,6 @@ bool cmCTestVC::WriteXMLUpdates(cmXMLWriter&) return true; } -//---------------------------------------------------------------------------- void cmCTestVC::WriteXMLEntry(cmXMLWriter& xml, std::string const& path, std::string const& name, diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx index 5b4a376..d3b99fb 100644 --- a/Source/CTest/cmParseCoberturaCoverage.cxx +++ b/Source/CTest/cmParseCoberturaCoverage.cxx @@ -5,7 +5,6 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> -//---------------------------------------------------------------------------- class cmParseCoberturaCoverage::XMLParser: public cmXMLParser { public: diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index c9a4618..d385677 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -69,7 +69,6 @@ bool cmProcess::StartProcess() == cmsysProcess_State_Executing); } -//---------------------------------------------------------------------------- bool cmProcess::Buffer::GetLine(std::string& line) { // Scan for the next newline. @@ -106,7 +105,6 @@ bool cmProcess::Buffer::GetLine(std::string& line) return false; } -//---------------------------------------------------------------------------- bool cmProcess::Buffer::GetLast(std::string& line) { // Return the partial last line, if any. @@ -120,7 +118,6 @@ bool cmProcess::Buffer::GetLast(std::string& line) return false; } -//---------------------------------------------------------------------------- int cmProcess::GetNextOutputLine(std::string& line, double timeout) { for(;;) diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index b7c22b1..6eccf54 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -23,7 +23,6 @@ #include <form.h> -//---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = { {0, @@ -31,7 +30,6 @@ static const char * cmDocumentationName[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsage[][2] = { {0, @@ -44,7 +42,6 @@ static const char * cmDocumentationUsage[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsageNote[][2] = { {0, @@ -52,7 +49,6 @@ static const char * cmDocumentationUsageNote[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationOptions[][2] = { CMAKE_STANDARD_OPTIONS_TABLE, diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index b44219f..b78a5df 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -25,7 +25,6 @@ #include <cmsys/Encoding.hxx> #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = { {0, @@ -33,7 +32,6 @@ static const char * cmDocumentationName[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsage[][2] = { {0, @@ -43,7 +41,6 @@ static const char * cmDocumentationUsage[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationOptions[][2] = { {0,0} diff --git a/Source/cmAddCustomCommandCommand.cxx b/Source/cmAddCustomCommandCommand.cxx index fe516ea..30f431c 100644 --- a/Source/cmAddCustomCommandCommand.cxx +++ b/Source/cmAddCustomCommandCommand.cxx @@ -412,7 +412,6 @@ bool cmAddCustomCommandCommand return true; } -//---------------------------------------------------------------------------- bool cmAddCustomCommandCommand ::CheckOutputs(const std::vector<std::string>& outputs) diff --git a/Source/cmAddTestCommand.cxx b/Source/cmAddTestCommand.cxx index 3472b98..e813415 100644 --- a/Source/cmAddTestCommand.cxx +++ b/Source/cmAddTestCommand.cxx @@ -65,7 +65,6 @@ bool cmAddTestCommand return true; } -//---------------------------------------------------------------------------- bool cmAddTestCommand::HandleNameMode(std::vector<std::string> const& args) { std::string name; diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index b06b2f5..399c513 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -22,14 +22,12 @@ # define __LA_SSIZE_T la_ssize_t #endif -//---------------------------------------------------------------------------- static std::string cm_archive_error_string(struct archive* a) { const char* e = archive_error_string(a); return e? e : "unknown error"; } -//---------------------------------------------------------------------------- static void cm_archive_entry_copy_pathname(struct archive_entry* e, const std::string& dest) { @@ -40,7 +38,6 @@ static void cm_archive_entry_copy_pathname(struct archive_entry* e, #endif } -//---------------------------------------------------------------------------- static void cm_archive_entry_copy_sourcepath(struct archive_entry* e, const std::string& file) { @@ -51,7 +48,6 @@ static void cm_archive_entry_copy_sourcepath(struct archive_entry* e, #endif } -//---------------------------------------------------------------------------- class cmArchiveWrite::Entry { struct archive_entry* Object; @@ -61,7 +57,6 @@ public: operator struct archive_entry*() { return this->Object; } }; -//---------------------------------------------------------------------------- struct cmArchiveWrite::Callback { // archive_write_callback @@ -81,7 +76,6 @@ struct cmArchiveWrite::Callback } }; -//---------------------------------------------------------------------------- cmArchiveWrite::cmArchiveWrite( std::ostream& os, Compress c, std::string const& format): Stream(os), @@ -177,14 +171,12 @@ cmArchiveWrite::cmArchiveWrite( } } -//---------------------------------------------------------------------------- cmArchiveWrite::~cmArchiveWrite() { archive_read_free(this->Disk); archive_write_free(this->Archive); } -//---------------------------------------------------------------------------- bool cmArchiveWrite::Add(std::string path, size_t skip, const char* prefix, @@ -201,7 +193,6 @@ bool cmArchiveWrite::Add(std::string path, return this->Okay(); } -//---------------------------------------------------------------------------- bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix, bool recursive) @@ -239,7 +230,6 @@ bool cmArchiveWrite::AddPath(const char* path, return true; } -//---------------------------------------------------------------------------- bool cmArchiveWrite::AddFile(const char* file, size_t skip, const char* prefix) { @@ -344,7 +334,6 @@ bool cmArchiveWrite::AddFile(const char* file, return true; } -//---------------------------------------------------------------------------- bool cmArchiveWrite::AddData(const char* file, size_t size) { cmsys::ifstream fin(file, std::ios::in | std::ios::binary); diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx index 64d4fca..b9183ed 100644 --- a/Source/cmBuildCommand.cxx +++ b/Source/cmBuildCommand.cxx @@ -13,7 +13,6 @@ #include "cmGlobalGenerator.h" -//---------------------------------------------------------------------- bool cmBuildCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -27,7 +26,6 @@ bool cmBuildCommand return this->MainSignature(args); } -//---------------------------------------------------------------------- bool cmBuildCommand ::MainSignature(std::vector<std::string> const& args) { @@ -113,7 +111,6 @@ bool cmBuildCommand return true; } -//---------------------------------------------------------------------- bool cmBuildCommand ::TwoArgsSignature(std::vector<std::string> const& args) { diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx index 8591ed6..eac5965 100644 --- a/Source/cmCMakeMinimumRequired.cxx +++ b/Source/cmCMakeMinimumRequired.cxx @@ -127,7 +127,6 @@ bool cmCMakeMinimumRequired return true; } -//---------------------------------------------------------------------------- bool cmCMakeMinimumRequired::EnforceUnknownArguments() { if(!this->UnknownArguments.empty()) diff --git a/Source/cmCMakePolicyCommand.cxx b/Source/cmCMakePolicyCommand.cxx index 3ef6d35..9132aec 100644 --- a/Source/cmCMakePolicyCommand.cxx +++ b/Source/cmCMakePolicyCommand.cxx @@ -62,7 +62,6 @@ bool cmCMakePolicyCommand return false; } -//---------------------------------------------------------------------------- bool cmCMakePolicyCommand::HandleSetMode(std::vector<std::string> const& args) { if(args.size() != 3) @@ -112,7 +111,6 @@ bool cmCMakePolicyCommand::HandleSetMode(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmCMakePolicyCommand::HandleGetMode(std::vector<std::string> const& args) { if(args.size() != 3) @@ -169,7 +167,6 @@ bool cmCMakePolicyCommand::HandleGetMode(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmCMakePolicyCommand::HandleVersionMode(std::vector<std::string> const& args) { diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 1f07a07..a189430 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -64,7 +64,6 @@ #define DEBUGOUT std::cout << __LINE__ << " "; std::cout #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr -//---------------------------------------------------------------------- struct tm* cmCTest::GetNightlyTime(std::string str, bool tomorrowtag) { @@ -123,7 +122,6 @@ struct tm* cmCTest::GetNightlyTime(std::string str, return lctime; } -//---------------------------------------------------------------------- std::string cmCTest::CleanString(const std::string& str) { std::string::size_type spos = str.find_first_not_of(" \n\t\r\f\v"); @@ -139,7 +137,6 @@ std::string cmCTest::CleanString(const std::string& str) return str.substr(spos, epos); } -//---------------------------------------------------------------------- std::string cmCTest::CurrentTime() { time_t currenttime = time(0); @@ -158,7 +155,6 @@ std::string cmCTest::CurrentTime() return cmCTest::CleanString(current_time); } -//---------------------------------------------------------------------- std::string cmCTest::GetCostDataFile() { std::string fname = this->GetCTestConfiguration("CostDataFile"); @@ -170,7 +166,6 @@ std::string cmCTest::GetCostDataFile() } #ifdef CMAKE_BUILD_WITH_CMAKE -//---------------------------------------------------------------------------- static size_t HTTPResponseCallback(void *ptr, size_t size, size_t nmemb, void *data) { @@ -184,7 +179,6 @@ HTTPResponseCallback(void *ptr, size_t size, size_t nmemb, void *data) return realsize; } -//---------------------------------------------------------------------------- int cmCTest::HTTPRequest(std::string url, HTTPMethod method, std::string& response, std::string fields, @@ -240,7 +234,6 @@ int cmCTest::HTTPRequest(std::string url, HTTPMethod method, } #endif -//---------------------------------------------------------------------- std::string cmCTest::MakeURLSafe(const std::string& str) { std::ostringstream ost; @@ -267,7 +260,6 @@ std::string cmCTest::MakeURLSafe(const std::string& str) return ost.str(); } -//---------------------------------------------------------------------------- std::string cmCTest::DecodeURL(const std::string& in) { std::string out; @@ -287,7 +279,6 @@ std::string cmCTest::DecodeURL(const std::string& in) return out; } -//---------------------------------------------------------------------- cmCTest::cmCTest() { this->LabelSummary = true; @@ -381,7 +372,6 @@ cmCTest::cmCTest() cmSystemTools::EnableVSConsoleOutput(); } -//---------------------------------------------------------------------- cmCTest::~cmCTest() { cmDeleteAll(this->TestingHandlers); @@ -398,7 +388,6 @@ void cmCTest::SetTestLoad(unsigned long load) this->TestLoad = load; } -//---------------------------------------------------------------------------- bool cmCTest::ShouldCompressTestOutput() { if(!this->ComputedCompressTestOutput) @@ -415,7 +404,6 @@ bool cmCTest::ShouldCompressTestOutput() return this->CompressTestOutput; } -//---------------------------------------------------------------------------- bool cmCTest::ShouldCompressMemCheckOutput() { if(!this->ComputedCompressMemCheckOutput) @@ -430,7 +418,6 @@ bool cmCTest::ShouldCompressMemCheckOutput() return this->CompressMemCheckOutput; } -//---------------------------------------------------------------------------- std::string cmCTest::GetCDashVersion() { #ifdef CMAKE_BUILD_WITH_CMAKE @@ -455,7 +442,6 @@ std::string cmCTest::GetCDashVersion() #endif } -//---------------------------------------------------------------------------- cmCTest::Part cmCTest::GetPartFromName(const char* name) { // Look up by lower-case to make names case-insensitive. @@ -470,7 +456,6 @@ cmCTest::Part cmCTest::GetPartFromName(const char* name) return PartCount; } -//---------------------------------------------------------------------- int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command) { bool quiet = false; @@ -658,7 +643,6 @@ int cmCTest::Initialize(const char* binary_dir, cmCTestStartCommand* command) return 1; } -//---------------------------------------------------------------------- bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command) { std::string src_dir @@ -745,7 +729,6 @@ bool cmCTest::InitializeFromCommand(cmCTestStartCommand* command) } -//---------------------------------------------------------------------- bool cmCTest::UpdateCTestConfiguration() { if ( this->SuppressUpdatingCTestConfiguration ) @@ -848,7 +831,6 @@ bool cmCTest::UpdateCTestConfiguration() return true; } -//---------------------------------------------------------------------- void cmCTest::BlockTestErrorDiagnostics() { cmSystemTools::PutEnv("DART_TEST_FROM_DART=1"); @@ -860,14 +842,12 @@ void cmCTest::BlockTestErrorDiagnostics() #endif } -//---------------------------------------------------------------------- void cmCTest::SetTestModel(int mode) { this->InteractiveDebugMode = false; this->TestModel = mode; } -//---------------------------------------------------------------------- bool cmCTest::SetTest(const char* ttype, bool report) { if ( cmSystemTools::LowerCase(ttype) == "all" ) @@ -895,12 +875,10 @@ bool cmCTest::SetTest(const char* ttype, bool report) } } -//---------------------------------------------------------------------- void cmCTest::Finalize() { } -//---------------------------------------------------------------------- bool cmCTest::OpenOutputFile(const std::string& path, const std::string& name, cmGeneratedFileStream& stream, bool compress) @@ -947,7 +925,6 @@ bool cmCTest::OpenOutputFile(const std::string& path, return true; } -//---------------------------------------------------------------------- bool cmCTest::AddIfExists(Part part, const char* file) { if ( this->CTestFileExists(file) ) @@ -970,7 +947,6 @@ bool cmCTest::AddIfExists(Part part, const char* file) return true; } -//---------------------------------------------------------------------- bool cmCTest::CTestFileExists(const std::string& filename) { std::string testingDir = this->BinaryDir + "/Testing/" + @@ -978,7 +954,6 @@ bool cmCTest::CTestFileExists(const std::string& filename) return cmSystemTools::FileExists(testingDir.c_str()); } -//---------------------------------------------------------------------- cmCTestGenericHandler* cmCTest::GetInitializedHandler(const char* handler) { cmCTest::t_TestingHandlers::iterator it = @@ -991,7 +966,6 @@ cmCTestGenericHandler* cmCTest::GetInitializedHandler(const char* handler) return it->second; } -//---------------------------------------------------------------------- cmCTestGenericHandler* cmCTest::GetHandler(const char* handler) { cmCTest::t_TestingHandlers::iterator it = @@ -1003,7 +977,6 @@ cmCTestGenericHandler* cmCTest::GetHandler(const char* handler) return it->second; } -//---------------------------------------------------------------------- int cmCTest::ExecuteHandler(const char* shandler) { cmCTestGenericHandler* handler = this->GetHandler(shandler); @@ -1015,7 +988,6 @@ int cmCTest::ExecuteHandler(const char* shandler) return handler->ProcessHandler(); } -//---------------------------------------------------------------------- int cmCTest::ProcessTests() { int res = 0; @@ -1135,7 +1107,6 @@ int cmCTest::ProcessTests() return res; } -//---------------------------------------------------------------------- std::string cmCTest::GetTestModelString() { if ( !this->SpecificTrack.empty() ) @@ -1152,7 +1123,6 @@ std::string cmCTest::GetTestModelString() return "Experimental"; } -//---------------------------------------------------------------------- int cmCTest::GetTestModelFromString(const char* str) { if ( !str ) @@ -1176,7 +1146,6 @@ int cmCTest::GetTestModelFromString(const char* str) //###################################################################### //###################################################################### -//---------------------------------------------------------------------- int cmCTest::RunMakeCommand(const char* command, std::string& output, int* retVal, const char* dir, int timeout, std::ostream& ofs) { @@ -1294,7 +1263,6 @@ int cmCTest::RunMakeCommand(const char* command, std::string& output, //###################################################################### //###################################################################### -//---------------------------------------------------------------------- int cmCTest::RunTest(std::vector<const char*> argv, std::string* output, int *retVal, std::ostream* log, double testTimeOut, @@ -1472,7 +1440,6 @@ int cmCTest::RunTest(std::vector<const char*> argv, return result; } -//---------------------------------------------------------------------- std::string cmCTest::SafeBuildIdField(const std::string& value) { std::string safevalue(value); @@ -1507,7 +1474,6 @@ std::string cmCTest::SafeBuildIdField(const std::string& value) return safevalue; } -//---------------------------------------------------------------------- void cmCTest::StartXML(cmXMLWriter& xml, bool append) { if(this->CurrentTag.empty()) @@ -1574,7 +1540,6 @@ void cmCTest::StartXML(cmXMLWriter& xml, bool append) this->AddSiteProperties(xml); } -//---------------------------------------------------------------------- void cmCTest::AddSiteProperties(cmXMLWriter& xml) { cmCTestScriptHandler* ch = @@ -1622,14 +1587,12 @@ void cmCTest::AddSiteProperties(cmXMLWriter& xml) } } -//---------------------------------------------------------------------- void cmCTest::EndXML(cmXMLWriter& xml) { xml.EndElement(); // Site xml.EndDocument(); } -//---------------------------------------------------------------------- int cmCTest::GenerateCTestNotesOutput(cmXMLWriter& xml, const cmCTest::VectorOfStrings& files) { @@ -1683,7 +1646,6 @@ int cmCTest::GenerateCTestNotesOutput(cmXMLWriter& xml, return 1; } -//---------------------------------------------------------------------- int cmCTest::GenerateNotesFile(const VectorOfStrings &files) { cmGeneratedFileStream ofs; @@ -1697,7 +1659,6 @@ int cmCTest::GenerateNotesFile(const VectorOfStrings &files) return 0; } -//---------------------------------------------------------------------- int cmCTest::GenerateNotesFile(const char* cfiles) { if ( !cfiles ) @@ -1718,7 +1679,6 @@ int cmCTest::GenerateNotesFile(const char* cfiles) return this->GenerateNotesFile(files); } -//---------------------------------------------------------------------- std::string cmCTest::Base64GzipEncodeFile(std::string file) { std::string tarFile = file + "_temp.tar.gz"; @@ -1737,7 +1697,6 @@ std::string cmCTest::Base64GzipEncodeFile(std::string file) return base64; } -//---------------------------------------------------------------------- std::string cmCTest::Base64EncodeFile(std::string file) { size_t const len = cmSystemTools::FileLength(file); @@ -1768,7 +1727,6 @@ std::string cmCTest::Base64EncodeFile(std::string file) } -//---------------------------------------------------------------------- bool cmCTest::SubmitExtraFiles(const VectorOfStrings &files) { VectorOfStrings::const_iterator it; @@ -1788,7 +1746,6 @@ bool cmCTest::SubmitExtraFiles(const VectorOfStrings &files) return true; } -//---------------------------------------------------------------------- bool cmCTest::SubmitExtraFiles(const char* cfiles) { if ( !cfiles ) @@ -1810,7 +1767,6 @@ bool cmCTest::SubmitExtraFiles(const char* cfiles) } -//------------------------------------------------------- // for a -D argument convert the next argument into // the proper list of dashboard steps via SetTest bool cmCTest::AddTestsForDashboardType(std::string &targ) @@ -1999,7 +1955,6 @@ bool cmCTest::AddTestsForDashboardType(std::string &targ) } -//---------------------------------------------------------------------- void cmCTest::ErrorMessageUnknownDashDValue(std::string &val) { cmCTestLog(this, ERROR_MESSAGE, @@ -2020,7 +1975,6 @@ void cmCTest::ErrorMessageUnknownDashDValue(std::string &val) } -//---------------------------------------------------------------------- bool cmCTest::CheckArgument(const std::string& arg, const char* varg1, const char* varg2) { @@ -2028,7 +1982,6 @@ bool cmCTest::CheckArgument(const std::string& arg, const char* varg1, } -//---------------------------------------------------------------------- // Processes one command line argument (and its arguments if any) // for many simple options and then returns bool cmCTest::HandleCommandLineArguments(size_t &i, @@ -2316,7 +2269,6 @@ bool cmCTest::HandleCommandLineArguments(size_t &i, return true; } -//---------------------------------------------------------------------- // handle the -S -SR and -SP arguments void cmCTest::HandleScriptArguments(size_t &i, std::vector<std::string> &args, @@ -2362,7 +2314,6 @@ void cmCTest::HandleScriptArguments(size_t &i, } } -//---------------------------------------------------------------------- bool cmCTest::AddVariableDefinition(const std::string &arg) { std::string name; @@ -2378,7 +2329,6 @@ bool cmCTest::AddVariableDefinition(const std::string &arg) return false; } -//---------------------------------------------------------------------- // the main entry point of ctest, called from main int cmCTest::Run(std::vector<std::string> &args, std::string* output) { @@ -2625,7 +2575,6 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output) return 1; } -//---------------------------------------------------------------------- void cmCTest::SetNotesFiles(const char* notes) { if ( !notes ) @@ -2635,14 +2584,12 @@ void cmCTest::SetNotesFiles(const char* notes) this->NotesFiles = notes; } -//---------------------------------------------------------------------- void cmCTest::SetStopTime(std::string time) { this->StopTime = time; this->DetermineNextDayStop(); } -//---------------------------------------------------------------------- int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf) { bool found = false; @@ -2719,7 +2666,6 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf) return 1; } -//---------------------------------------------------------------------- void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def, std::vector<std::string>& vec) { @@ -2740,7 +2686,6 @@ void cmCTest::PopulateCustomVector(cmMakefile* mf, const std::string& def, } } -//---------------------------------------------------------------------- void cmCTest::PopulateCustomInteger(cmMakefile* mf, const std::string& def, int& val) { @@ -2752,7 +2697,6 @@ void cmCTest::PopulateCustomInteger(cmMakefile* mf, const std::string& def, val = atoi(dval); } -//---------------------------------------------------------------------- std::string cmCTest::GetShortPathToFile(const char* cfname) { const std::string& sourceDir @@ -2819,7 +2763,6 @@ std::string cmCTest::GetShortPathToFile(const char* cfname) return path; } -//---------------------------------------------------------------------- std::string cmCTest::GetCTestConfiguration(const std::string& name) { if ( this->CTestConfigurationOverwrites.find(name) != @@ -2830,13 +2773,11 @@ std::string cmCTest::GetCTestConfiguration(const std::string& name) return this->CTestConfiguration[name]; } -//---------------------------------------------------------------------- void cmCTest::EmptyCTestConfiguration() { this->CTestConfiguration.clear(); } -//---------------------------------------------------------------------- void cmCTest::DetermineNextDayStop() { struct tm* lctime; @@ -2876,7 +2817,6 @@ void cmCTest::DetermineNextDayStop() } } -//---------------------------------------------------------------------- void cmCTest::SetCTestConfiguration(const char *name, const char* value, bool suppress) { @@ -2896,49 +2836,41 @@ void cmCTest::SetCTestConfiguration(const char *name, const char* value, } -//---------------------------------------------------------------------- std::string cmCTest::GetCurrentTag() { return this->CurrentTag; } -//---------------------------------------------------------------------- std::string cmCTest::GetBinaryDir() { return this->BinaryDir; } -//---------------------------------------------------------------------- std::string const& cmCTest::GetConfigType() { return this->ConfigType; } -//---------------------------------------------------------------------- bool cmCTest::GetShowOnly() { return this->ShowOnly; } -//---------------------------------------------------------------------- int cmCTest::GetMaxTestNameWidth() const { return this->MaxTestNameWidth; } -//---------------------------------------------------------------------- void cmCTest::SetProduceXML(bool v) { this->ProduceXML = v; } -//---------------------------------------------------------------------- bool cmCTest::GetProduceXML() { return this->ProduceXML; } -//---------------------------------------------------------------------- const char* cmCTest::GetSpecificTrack() { if ( this->SpecificTrack.empty() ) @@ -2948,7 +2880,6 @@ const char* cmCTest::GetSpecificTrack() return this->SpecificTrack.c_str(); } -//---------------------------------------------------------------------- void cmCTest::SetSpecificTrack(const char* track) { if ( !track ) @@ -2959,13 +2890,11 @@ void cmCTest::SetSpecificTrack(const char* track) this->SpecificTrack = track; } -//---------------------------------------------------------------------- void cmCTest::AddSubmitFile(Part part, const char* name) { this->Parts[part].SubmitFiles.push_back(name); } -//---------------------------------------------------------------------- void cmCTest::AddCTestConfigurationOverwrite(const std::string& overStr) { size_t epos = overStr.find("="); @@ -2983,7 +2912,6 @@ void cmCTest::AddCTestConfigurationOverwrite(const std::string& overStr) this->CTestConfigurationOverwrites[key] = value; } -//---------------------------------------------------------------------- void cmCTest::SetConfigType(const char* ct) { this->ConfigType = ct?ct:""; @@ -2993,7 +2921,6 @@ void cmCTest::SetConfigType(const char* ct) cmSystemTools::PutEnv(confTypeEnv); } -//---------------------------------------------------------------------- bool cmCTest::SetCTestConfigurationFromCMakeVariable(cmMakefile* mf, const char* dconfig, const std::string& cmake_var, bool suppress) { @@ -3124,7 +3051,6 @@ bool cmCTest::RunCommand( return result; } -//---------------------------------------------------------------------- void cmCTest::SetOutputLogFileName(const char* name) { if ( this->OutputLogFile) @@ -3138,7 +3064,6 @@ void cmCTest::SetOutputLogFileName(const char* name) } } -//---------------------------------------------------------------------- static const char* cmCTestStringLogType[] = { "DEBUG", @@ -3151,7 +3076,6 @@ static const char* cmCTestStringLogType[] = 0 }; -//---------------------------------------------------------------------- #ifdef cerr # undef cerr #endif @@ -3267,7 +3191,6 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg, } } -//------------------------------------------------------------------------- double cmCTest::GetRemainingTimeAllowed() { if (!this->GetHandler("script")) @@ -3281,7 +3204,6 @@ double cmCTest::GetRemainingTimeAllowed() return ch->GetRemainingTimeAllowed(); } -//---------------------------------------------------------------------- void cmCTest::OutputTestErrors(std::vector<char> const &process_output) { std::string test_outputs("\n*** Test Failed:\n"); @@ -3292,7 +3214,6 @@ void cmCTest::OutputTestErrors(std::vector<char> const &process_output) cmCTestLog(this, HANDLER_OUTPUT, test_outputs << std::endl << std::flush); } -//---------------------------------------------------------------------- bool cmCTest::CompressString(std::string& str) { int ret; diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 4dcd613..30caa32 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -204,7 +204,6 @@ bool cmCacheManager::LoadCache(const std::string& path, return true; } -//---------------------------------------------------------------------------- const char* cmCacheManager::PersistentProperties[] = { "ADVANCED", @@ -213,7 +212,6 @@ const char* cmCacheManager::PersistentProperties[] = 0 }; -//---------------------------------------------------------------------------- bool cmCacheManager::ReadPropertyEntry(std::string const& entryKey, CacheEntry& e) { @@ -250,7 +248,6 @@ bool cmCacheManager::ReadPropertyEntry(std::string const& entryKey, return false; } -//---------------------------------------------------------------------------- void cmCacheManager::WritePropertyEntries(std::ostream& os, CacheIterator const& i) { @@ -640,13 +637,11 @@ void cmCacheManager::CacheIterator::SetValue(const char* value) } } -//---------------------------------------------------------------------------- bool cmCacheManager::CacheIterator::GetValueAsBool() const { return cmSystemTools::IsOn(this->GetEntry().Value.c_str()); } -//---------------------------------------------------------------------------- const char* cmCacheManager::CacheEntry::GetProperty(const std::string& prop) const { @@ -661,7 +656,6 @@ cmCacheManager::CacheEntry::GetProperty(const std::string& prop) const return this->Properties.GetPropertyValue(prop); } -//---------------------------------------------------------------------------- void cmCacheManager::CacheEntry::SetProperty(const std::string& prop, const char* value) { @@ -679,7 +673,6 @@ void cmCacheManager::CacheEntry::SetProperty(const std::string& prop, } } -//---------------------------------------------------------------------------- void cmCacheManager::CacheEntry::AppendProperty(const std::string& prop, const char* value, bool asString) @@ -705,7 +698,6 @@ void cmCacheManager::CacheEntry::AppendProperty(const std::string& prop, } } -//---------------------------------------------------------------------------- const char* cmCacheManager::CacheIterator::GetProperty( const std::string& prop) const { @@ -716,7 +708,6 @@ const char* cmCacheManager::CacheIterator::GetProperty( return 0; } -//---------------------------------------------------------------------------- void cmCacheManager::CacheIterator::SetProperty(const std::string& p, const char* v) { @@ -726,7 +717,6 @@ void cmCacheManager::CacheIterator::SetProperty(const std::string& p, } } -//---------------------------------------------------------------------------- void cmCacheManager::CacheIterator::AppendProperty(const std::string& p, const char* v, bool asString) @@ -737,7 +727,6 @@ void cmCacheManager::CacheIterator::AppendProperty(const std::string& p, } } -//---------------------------------------------------------------------------- bool cmCacheManager::CacheIterator::GetPropertyAsBool( const std::string& prop) const { @@ -748,13 +737,11 @@ bool cmCacheManager::CacheIterator::GetPropertyAsBool( return false; } -//---------------------------------------------------------------------------- void cmCacheManager::CacheIterator::SetProperty(const std::string& p, bool v) { this->SetProperty(p, v ? "ON" : "OFF"); } -//---------------------------------------------------------------------------- bool cmCacheManager::CacheIterator::PropertyExists( const std::string& prop) const { diff --git a/Source/cmCallVisualStudioMacro.cxx b/Source/cmCallVisualStudioMacro.cxx index 636a827..9cc5a69 100644 --- a/Source/cmCallVisualStudioMacro.cxx +++ b/Source/cmCallVisualStudioMacro.cxx @@ -30,7 +30,6 @@ static bool LogErrorsAsMessages; #include <comdef.h> -//---------------------------------------------------------------------------- // Copied from a correct comdef.h to avoid problems with deficient versions // of comdef.h that exist in the wild... Fixes issue #7533. // @@ -49,7 +48,6 @@ static bool LogErrorsAsMessages; #endif -//---------------------------------------------------------------------------- ///! Use ReportHRESULT to make a cmSystemTools::Message after calling ///! a COM method that may have failed. #define ReportHRESULT(hr, context) \ @@ -68,7 +66,6 @@ static bool LogErrorsAsMessages; } -//---------------------------------------------------------------------------- ///! Using the given instance of Visual Studio, call the named macro HRESULT InstanceCallMacro( IDispatch* vsIDE, @@ -161,7 +158,6 @@ HRESULT InstanceCallMacro( } -//---------------------------------------------------------------------------- ///! Get the Solution object from the IDE object HRESULT GetSolutionObject( IDispatch* vsIDE, @@ -211,7 +207,6 @@ HRESULT GetSolutionObject( } -//---------------------------------------------------------------------------- ///! Get the FullName property from the Solution object HRESULT GetSolutionFullName( IDispatch* vsSolution, @@ -261,7 +256,6 @@ HRESULT GetSolutionFullName( } -//---------------------------------------------------------------------------- ///! Get the FullName property from the Solution object, given the IDE object HRESULT GetIDESolutionFullName( IDispatch* vsIDE, @@ -281,7 +275,6 @@ HRESULT GetIDESolutionFullName( } -//---------------------------------------------------------------------------- ///! Get all running objects from the Windows running object table. ///! Save them in a map by their display names. HRESULT GetRunningInstances(std::map<std::string, IUnknownPtr>& mrot) @@ -347,7 +340,6 @@ HRESULT GetRunningInstances(std::map<std::string, IUnknownPtr>& mrot) } -//---------------------------------------------------------------------------- ///! Do the two file names refer to the same Visual Studio solution? Or are ///! we perhaps looking for any and all solutions? bool FilesSameSolution( @@ -370,7 +362,6 @@ bool FilesSameSolution( } -//---------------------------------------------------------------------------- ///! Find instances of Visual Studio with the given solution file ///! open. Pass "ALL" for slnFile to gather all running instances ///! of Visual Studio. @@ -421,7 +412,6 @@ HRESULT FindVisualStudioInstances( #endif //defined(HAVE_COMDEF_H) -//---------------------------------------------------------------------------- int cmCallVisualStudioMacro::GetNumberOfRunningVisualStudioInstances( const std::string& slnFile) { @@ -457,7 +447,6 @@ int cmCallVisualStudioMacro::GetNumberOfRunningVisualStudioInstances( } -//---------------------------------------------------------------------------- ///! Get all running objects from the Windows running object table. ///! Save them in a map by their display names. int cmCallVisualStudioMacro::CallMacro( diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index b5688a8..d00a416 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -52,19 +52,16 @@ std::string cmCommonTargetGenerator::Convert( return this->LocalGenerator->Convert(source, relative, output); } -//---------------------------------------------------------------------------- const char* cmCommonTargetGenerator::GetFeature(const std::string& feature) { return this->GeneratorTarget->GetFeature(feature, this->ConfigName); } -//---------------------------------------------------------------------------- bool cmCommonTargetGenerator::GetFeatureAsBool(const std::string& feature) { return this->GeneratorTarget->GetFeatureAsBool(feature, this->ConfigName); } -//---------------------------------------------------------------------------- void cmCommonTargetGenerator::AddFeatureFlags( std::string& flags, const std::string& lang ) @@ -78,7 +75,6 @@ void cmCommonTargetGenerator::AddFeatureFlags( } } -//---------------------------------------------------------------------------- void cmCommonTargetGenerator::AddModuleDefinitionFlag(std::string& flags) { if(!this->ModuleDefinitionFile) @@ -102,7 +98,6 @@ void cmCommonTargetGenerator::AddModuleDefinitionFlag(std::string& flags) this->LocalGenerator->AppendFlags(flags, flag); } -//---------------------------------------------------------------------------- std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const { std::string mod_dir; @@ -132,7 +127,6 @@ std::string cmCommonTargetGenerator::ComputeFortranModuleDirectory() const return mod_dir; } -//---------------------------------------------------------------------------- std::string cmCommonTargetGenerator::GetFortranModuleDirectory() { // Compute the module directory. @@ -146,7 +140,6 @@ std::string cmCommonTargetGenerator::GetFortranModuleDirectory() return this->FortranModuleDirectory; } -//---------------------------------------------------------------------------- void cmCommonTargetGenerator::AddFortranFlags(std::string& flags) { // Enable module output if necessary. @@ -202,7 +195,6 @@ void cmCommonTargetGenerator::AddFortranFlags(std::string& flags) } } -//---------------------------------------------------------------------------- void cmCommonTargetGenerator ::AppendFortranFormatFlags(std::string& flags, cmSourceFile const& source) @@ -231,7 +223,6 @@ cmCommonTargetGenerator } } -//---------------------------------------------------------------------------- std::string cmCommonTargetGenerator::GetFrameworkFlags(std::string const& l) { if(!this->Makefile->IsOn("APPLE")) @@ -293,7 +284,6 @@ std::string cmCommonTargetGenerator::GetFrameworkFlags(std::string const& l) return flags; } -//---------------------------------------------------------------------------- std::string cmCommonTargetGenerator::GetFlags(const std::string &l) { ByLanguageMap::iterator i = this->FlagsByLanguage.find(l); diff --git a/Source/cmComputeComponentGraph.cxx b/Source/cmComputeComponentGraph.cxx index 5bec6a1..9cd780d 100644 --- a/Source/cmComputeComponentGraph.cxx +++ b/Source/cmComputeComponentGraph.cxx @@ -15,7 +15,6 @@ #include <assert.h> -//---------------------------------------------------------------------------- cmComputeComponentGraph::cmComputeComponentGraph(Graph const& input): InputGraph(input) { @@ -28,12 +27,10 @@ cmComputeComponentGraph::cmComputeComponentGraph(Graph const& input): this->TransferEdges(); } -//---------------------------------------------------------------------------- cmComputeComponentGraph::~cmComputeComponentGraph() { } -//---------------------------------------------------------------------------- void cmComputeComponentGraph::Tarjan() { int n = static_cast<int>(this->InputGraph.size()); @@ -58,7 +55,6 @@ void cmComputeComponentGraph::Tarjan() } } -//---------------------------------------------------------------------------- void cmComputeComponentGraph::TarjanVisit(int i) { // We are now visiting this node. @@ -133,7 +129,6 @@ void cmComputeComponentGraph::TarjanVisit(int i) } } -//---------------------------------------------------------------------------- void cmComputeComponentGraph::TransferEdges() { // Map inter-component edges in the original graph to edges in the diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index f546fc8..23ea371 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -170,7 +170,6 @@ items that we know the linker will re-use automatically (shared libs). */ -//---------------------------------------------------------------------------- cmComputeLinkDepends ::cmComputeLinkDepends(const cmGeneratorTarget* target, const std::string& config) @@ -199,20 +198,17 @@ cmComputeLinkDepends this->CCG = 0; } -//---------------------------------------------------------------------------- cmComputeLinkDepends::~cmComputeLinkDepends() { cmDeleteAll(this->InferredDependSets); delete this->CCG; } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::SetOldLinkDirMode(bool b) { this->OldLinkDirMode = b; } -//---------------------------------------------------------------------------- std::vector<cmComputeLinkDepends::LinkEntry> const& cmComputeLinkDepends::Compute() { @@ -290,7 +286,6 @@ cmComputeLinkDepends::Compute() return this->FinalLinkEntries; } -//---------------------------------------------------------------------------- std::map<std::string, int>::iterator cmComputeLinkDepends::AllocateLinkEntry(std::string const& item) { @@ -304,7 +299,6 @@ cmComputeLinkDepends::AllocateLinkEntry(std::string const& item) return lei; } -//---------------------------------------------------------------------------- int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item) { // Check if the item entry has already been added. @@ -354,7 +348,6 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item) return index; } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe) { // Get this entry representation. @@ -397,7 +390,6 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const& qe) } } -//---------------------------------------------------------------------------- void cmComputeLinkDepends ::FollowSharedDeps(int depender_index, cmLinkInterface const* iface, @@ -414,7 +406,6 @@ cmComputeLinkDepends } } -//---------------------------------------------------------------------------- void cmComputeLinkDepends ::QueueSharedDependencies(int depender_index, @@ -430,7 +421,6 @@ cmComputeLinkDepends } } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep) { // Check if the target already has an entry. @@ -472,7 +462,6 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep) } } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::AddVarLinkEntries(int depender_index, const char* value) { @@ -550,7 +539,6 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index, this->AddLinkEntries(depender_index, actual_libs); } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::AddDirectLinkEntries() { // Add direct link dependencies in this configuration. @@ -565,7 +553,6 @@ void cmComputeLinkDepends::AddDirectLinkEntries() } } -//---------------------------------------------------------------------------- template <typename T> void cmComputeLinkDepends::AddLinkEntries( @@ -632,7 +619,6 @@ cmComputeLinkDepends::AddLinkEntries( } } -//---------------------------------------------------------------------------- cmGeneratorTarget const* cmComputeLinkDepends::FindTargetToLink(int depender_index, const std::string& name) @@ -650,7 +636,6 @@ cmComputeLinkDepends::FindTargetToLink(int depender_index, return from->FindTargetToLink(name); } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::InferDependencies() { // The inferred dependency sets for each item list the possible @@ -685,7 +670,6 @@ void cmComputeLinkDepends::InferDependencies() } } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::CleanConstraintGraph() { for(Graph::iterator i = this->EntryConstraintGraph.begin(); @@ -700,7 +684,6 @@ void cmComputeLinkDepends::CleanConstraintGraph() } } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::DisplayConstraintGraph() { // Display the graph nodes and their edges. @@ -714,7 +697,6 @@ void cmComputeLinkDepends::DisplayConstraintGraph() fprintf(stderr, "%s\n", e.str().c_str()); } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::OrderLinkEntires() { // Compute the DAG of strongly connected components. The algorithm @@ -765,7 +747,6 @@ void cmComputeLinkDepends::OrderLinkEntires() } } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::DisplayComponents() { @@ -793,7 +774,6 @@ cmComputeLinkDepends::DisplayComponents() fprintf(stderr, "\n"); } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::VisitComponent(unsigned int c) { // Check if the node has already been visited. @@ -819,7 +799,6 @@ void cmComputeLinkDepends::VisitComponent(unsigned int c) this->ComponentOrder[c] = --this->ComponentOrderId; } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::VisitEntry(int index) { // Include this entry on the link line. @@ -890,7 +869,6 @@ void cmComputeLinkDepends::VisitEntry(int index) } } -//---------------------------------------------------------------------------- cmComputeLinkDepends::PendingComponent& cmComputeLinkDepends::MakePendingComponent(unsigned int component) { @@ -928,7 +906,6 @@ cmComputeLinkDepends::MakePendingComponent(unsigned int component) return pc; } -//---------------------------------------------------------------------------- int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl) { unsigned int count = 2; @@ -949,7 +926,6 @@ int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl) return count; } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::DisplayFinalEntries() { fprintf(stderr, "target [%s] links to:\n", this->Target->GetName().c_str()); @@ -969,7 +945,6 @@ void cmComputeLinkDepends::DisplayFinalEntries() fprintf(stderr, "\n"); } -//---------------------------------------------------------------------------- void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item) { if(!this->OldLinkDirMode) diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index fa11f33..0aa6a99 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -240,7 +240,6 @@ because this need be done only for shared libraries without soname-s. */ -//---------------------------------------------------------------------------- cmComputeLinkInformation ::cmComputeLinkInformation(const cmGeneratorTarget* target, const std::string& config) @@ -422,7 +421,6 @@ cmComputeLinkInformation "CMAKE_POLICY_WARNING_CMP0060"); } -//---------------------------------------------------------------------------- cmComputeLinkInformation::~cmComputeLinkInformation() { delete this->OrderLinkerSearchPath; @@ -430,20 +428,17 @@ cmComputeLinkInformation::~cmComputeLinkInformation() delete this->OrderDependentRPath; } -//---------------------------------------------------------------------------- cmComputeLinkInformation::ItemVector const& cmComputeLinkInformation::GetItems() { return this->Items; } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmComputeLinkInformation::GetDirectories() { return this->OrderLinkerSearchPath->GetOrderedDirectories(); } -//---------------------------------------------------------------------------- std::string cmComputeLinkInformation::GetRPathLinkString() { // If there is no separate linker runtime search flag (-rpath-link) @@ -457,26 +452,22 @@ std::string cmComputeLinkInformation::GetRPathLinkString() return cmJoin(this->OrderDependentRPath->GetOrderedDirectories(), ":"); } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmComputeLinkInformation::GetDepends() { return this->Depends; } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmComputeLinkInformation::GetFrameworkPaths() { return this->FrameworkPaths; } -//---------------------------------------------------------------------------- const std::set<const cmGeneratorTarget*>& cmComputeLinkInformation::GetSharedLibrariesLinked() { return this->SharedLibrariesLinked; } -//---------------------------------------------------------------------------- bool cmComputeLinkInformation::Compute() { // Skip targets that do not link. @@ -579,7 +570,6 @@ bool cmComputeLinkInformation::Compute() return true; } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddImplicitLinkInfo() { // The link closure lists all languages whose implicit info is needed. @@ -596,7 +586,6 @@ void cmComputeLinkInformation::AddImplicitLinkInfo() } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddImplicitLinkInfo(std::string const& lang) { // Add libraries for this language that are not implied by the @@ -631,7 +620,6 @@ void cmComputeLinkInformation::AddImplicitLinkInfo(std::string const& lang) } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddItem(std::string const& item, cmGeneratorTarget const* tgt) { @@ -714,7 +702,6 @@ void cmComputeLinkInformation::AddItem(std::string const& item, } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddSharedDepItem(std::string const& item, const cmGeneratorTarget* tgt) { @@ -804,7 +791,6 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item, } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::ComputeLinkTypeInfo() { // Check whether archives may actually be shared libraries. @@ -861,7 +847,6 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo() this->CurrentLinkType = this->StartLinkType; } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::ComputeItemParserInfo() { // Get possible library name prefixes. @@ -960,7 +945,6 @@ void cmComputeLinkInformation::ComputeItemParserInfo() } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddLinkPrefix(const char* p) { if(p && *p) @@ -969,7 +953,6 @@ void cmComputeLinkInformation::AddLinkPrefix(const char* p) } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddLinkExtension(const char* e, LinkType type) { if(e && *e) @@ -986,7 +969,6 @@ void cmComputeLinkInformation::AddLinkExtension(const char* e, LinkType type) } } -//---------------------------------------------------------------------------- std::string cmComputeLinkInformation ::CreateExtensionRegex(std::vector<std::string> const& exts, LinkType type) @@ -1027,7 +1009,6 @@ cmComputeLinkInformation return libext; } -//---------------------------------------------------------------------------- std::string cmComputeLinkInformation::NoCaseExpression(const char* str) { std::string ret; @@ -1050,7 +1031,6 @@ std::string cmComputeLinkInformation::NoCaseExpression(const char* str) return ret; } -//------------------------------------------------------------------- void cmComputeLinkInformation::SetCurrentLinkType(LinkType lt) { // If we are changing the current link type add the flag to tell the @@ -1076,7 +1056,6 @@ void cmComputeLinkInformation::SetCurrentLinkType(LinkType lt) } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddTargetItem(std::string const& item, cmGeneratorTarget const* target) { @@ -1124,7 +1103,6 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item, this->Items.push_back(Item(item, true, target)); } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddFullItem(std::string const& item) { // Check for the implicit link directory special case. @@ -1194,7 +1172,6 @@ void cmComputeLinkInformation::AddFullItem(std::string const& item) this->Items.push_back(Item(item, true)); } -//---------------------------------------------------------------------------- bool cmComputeLinkInformation::CheckImplicitDirItem(std::string const& item) { // We only switch to a pathless item if the link type may be @@ -1258,7 +1235,6 @@ bool cmComputeLinkInformation::CheckImplicitDirItem(std::string const& item) return true; } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddUserItem(std::string const& item, bool pathNotKnown) { @@ -1376,7 +1352,6 @@ void cmComputeLinkInformation::AddUserItem(std::string const& item, // specification. } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddFrameworkItem(std::string const& item) { // Try to separate the framework name and path. @@ -1411,7 +1386,6 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item) this->Items.push_back(Item(fw, false)); } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddDirectoryItem(std::string const& item) { if(this->Makefile->IsOn("APPLE") @@ -1425,7 +1399,6 @@ void cmComputeLinkInformation::AddDirectoryItem(std::string const& item) } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::DropDirectoryItem(std::string const& item) { // A full path to a directory was found as a link item. Warn the @@ -1438,7 +1411,6 @@ void cmComputeLinkInformation::DropDirectoryItem(std::string const& item) cmSystemTools::Message(e.str().c_str()); } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::ComputeFrameworkInfo() { // Avoid adding implicit framework paths. @@ -1468,7 +1440,6 @@ void cmComputeLinkInformation::ComputeFrameworkInfo() this->SplitFramework.compile("(.*)/(.*)\\.framework$"); } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddFrameworkPath(std::string const& p) { if(this->FrameworkPathsEmmitted.insert(p).second) @@ -1477,7 +1448,6 @@ void cmComputeLinkInformation::AddFrameworkPath(std::string const& p) } } -//---------------------------------------------------------------------------- bool cmComputeLinkInformation::CheckSharedLibNoSOName(std::string const& item) { // This platform will use the path to a library as its soname if the @@ -1499,7 +1469,6 @@ bool cmComputeLinkInformation::CheckSharedLibNoSOName(std::string const& item) return false; } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddSharedLibNoSOName(std::string const& item) { // We have a full path to a shared library with no soname. We need @@ -1514,7 +1483,6 @@ void cmComputeLinkInformation::AddSharedLibNoSOName(std::string const& item) this->OrderLinkerSearchPath->AddLinkLibrary(item); } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::HandleBadFullItem(std::string const& item, std::string const& file) { @@ -1578,7 +1546,6 @@ void cmComputeLinkInformation::HandleBadFullItem(std::string const& item, } } -//---------------------------------------------------------------------------- bool cmComputeLinkInformation::FinishLinkerSearchDirectories() { // Support broken projects if necessary. @@ -1631,7 +1598,6 @@ bool cmComputeLinkInformation::FinishLinkerSearchDirectories() return true; } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::PrintLinkPolicyDiagnosis(std::ostream& os) { // Tell the user what to do. @@ -1702,7 +1668,6 @@ void cmComputeLinkInformation::PrintLinkPolicyDiagnosis(std::ostream& os) << "Run \"cmake --help-policy CMP0003\" for more information."; } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::LoadImplicitLinkInfo() { std::vector<std::string> implicitDirVec; @@ -1773,14 +1738,12 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo() } } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmComputeLinkInformation::GetRuntimeSearchPath() { return this->OrderRuntimeSearchPath->GetOrderedDirectories(); } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath, cmGeneratorTarget const* target) @@ -1823,7 +1786,6 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath, } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath) { @@ -1891,7 +1853,6 @@ cmComputeLinkInformation::AddLibraryRuntimeInfo(std::string const& fullPath) } } -//---------------------------------------------------------------------------- static void cmCLI_ExpandListUnique(const char* str, std::vector<std::string>& out, std::set<std::string>& emitted) @@ -1907,7 +1868,6 @@ static void cmCLI_ExpandListUnique(const char* str, } } -//---------------------------------------------------------------------------- void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs, bool for_install) { @@ -2033,7 +1993,6 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs, cmCLI_ExpandListUnique(this->RuntimeAlways.c_str(), runtimeDirs, emitted); } -//---------------------------------------------------------------------------- std::string cmComputeLinkInformation::GetRPathString(bool for_install) { // Get the directories to use. @@ -2065,7 +2024,6 @@ std::string cmComputeLinkInformation::GetRPathString(bool for_install) return rpath; } -//---------------------------------------------------------------------------- std::string cmComputeLinkInformation::GetChrpathString() { if(!this->RuntimeUseChrpath) diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index 7f12006..1b5297f 100644 --- a/Source/cmComputeTargetDepends.cxx +++ b/Source/cmComputeTargetDepends.cxx @@ -94,7 +94,6 @@ transitively on all the static libraries it links. */ -//---------------------------------------------------------------------------- cmComputeTargetDepends::cmComputeTargetDepends(cmGlobalGenerator* gg) { this->GlobalGenerator = gg; @@ -105,12 +104,10 @@ cmComputeTargetDepends::cmComputeTargetDepends(cmGlobalGenerator* gg) ->GetGlobalPropertyAsBool("GLOBAL_DEPENDS_NO_CYCLES"); } -//---------------------------------------------------------------------------- cmComputeTargetDepends::~cmComputeTargetDepends() { } -//---------------------------------------------------------------------------- bool cmComputeTargetDepends::Compute() { // Build the original graph. @@ -145,7 +142,6 @@ bool cmComputeTargetDepends::Compute() return true; } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::GetTargetDirectDepends(cmGeneratorTarget const* t, cmTargetDependSet& deps) @@ -167,7 +163,6 @@ cmComputeTargetDepends::GetTargetDirectDepends(cmGeneratorTarget const* t, } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::CollectTargets() { // Collect all targets from all generators. @@ -188,7 +183,6 @@ void cmComputeTargetDepends::CollectTargets() } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::CollectDepends() { // Allocate the dependency graph adjacency lists. @@ -201,7 +195,6 @@ void cmComputeTargetDepends::CollectDepends() } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::CollectTargetDepends(int depender_index) { // Get the depender. @@ -287,7 +280,6 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index) } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, const cmGeneratorTarget* dependee, const std::string& config, @@ -312,7 +304,6 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, cmLinkItem const& dependee_name, std::set<std::string> &emitted) @@ -344,7 +335,6 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index, } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::AddTargetDepend( int depender_index, cmLinkItem const& dependee_name, bool linking) @@ -411,7 +401,6 @@ void cmComputeTargetDepends::AddTargetDepend( } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::AddTargetDepend(int depender_index, const cmGeneratorTarget* dependee, bool linking) @@ -446,7 +435,6 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index, } } -//---------------------------------------------------------------------------- void cmComputeTargetDepends::DisplayGraph(Graph const& graph, const std::string& name) @@ -470,7 +458,6 @@ cmComputeTargetDepends::DisplayGraph(Graph const& graph, fprintf(stderr, "\n"); } -//---------------------------------------------------------------------------- void cmComputeTargetDepends ::DisplayComponents(cmComputeComponentGraph const& ccg) @@ -492,7 +479,6 @@ cmComputeTargetDepends fprintf(stderr, "\n"); } -//---------------------------------------------------------------------------- bool cmComputeTargetDepends ::CheckComponents(cmComputeComponentGraph const& ccg) @@ -532,7 +518,6 @@ cmComputeTargetDepends return true; } -//---------------------------------------------------------------------------- void cmComputeTargetDepends ::ComplainAboutBadComponent(cmComputeComponentGraph const& ccg, int c, @@ -589,7 +574,6 @@ cmComputeTargetDepends cmSystemTools::Error(e.str().c_str()); } -//---------------------------------------------------------------------------- bool cmComputeTargetDepends ::IntraComponent(std::vector<int> const& cmap, int c, int i, int* head, @@ -631,7 +615,6 @@ cmComputeTargetDepends return true; } -//---------------------------------------------------------------------------- bool cmComputeTargetDepends ::ComputeFinalDepends(cmComputeComponentGraph const& ccg) diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx index d1112f2..5eb0239 100644 --- a/Source/cmCryptoHash.cxx +++ b/Source/cmCryptoHash.cxx @@ -15,7 +15,6 @@ #include <cmsys/FStream.hxx> #include <cmsys/MD5.h> -//---------------------------------------------------------------------------- cmsys::auto_ptr<cmCryptoHash> cmCryptoHash::New(const char* algo) { if(strcmp(algo,"MD5") == 0) @@ -34,7 +33,6 @@ cmsys::auto_ptr<cmCryptoHash> cmCryptoHash::New(const char* algo) { return cmsys::auto_ptr<cmCryptoHash>(0); } } -//---------------------------------------------------------------------------- std::string cmCryptoHash::HashString(const std::string& input) { this->Initialize(); @@ -43,7 +41,6 @@ std::string cmCryptoHash::HashString(const std::string& input) return this->Finalize(); } -//---------------------------------------------------------------------------- std::string cmCryptoHash::HashFile(const std::string& file) { cmsys::ifstream fin(file.c_str(), std::ios::in | std::ios::binary); @@ -79,30 +76,25 @@ std::string cmCryptoHash::HashFile(const std::string& file) return ""; } -//---------------------------------------------------------------------------- cmCryptoHashMD5::cmCryptoHashMD5(): MD5(cmsysMD5_New()) { } -//---------------------------------------------------------------------------- cmCryptoHashMD5::~cmCryptoHashMD5() { cmsysMD5_Delete(this->MD5); } -//---------------------------------------------------------------------------- void cmCryptoHashMD5::Initialize() { cmsysMD5_Initialize(this->MD5); } -//---------------------------------------------------------------------------- void cmCryptoHashMD5::Append(unsigned char const* buf, int sz) { cmsysMD5_Append(this->MD5, buf, sz); } -//---------------------------------------------------------------------------- std::string cmCryptoHashMD5::Finalize() { char md5out[32]; diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx index 35a68c0..c135f27 100644 --- a/Source/cmCurl.cxx +++ b/Source/cmCurl.cxx @@ -26,7 +26,6 @@ e += ::curl_easy_strerror(result); \ } -//---------------------------------------------------------------------------- std::string cmCurlSetCAInfo(::CURL *curl, const char* cafile) { std::string e; diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx index 7c37e3b..e2bd8b1 100644 --- a/Source/cmCustomCommand.cxx +++ b/Source/cmCustomCommand.cxx @@ -15,7 +15,6 @@ #include <cmsys/auto_ptr.hxx> -//---------------------------------------------------------------------------- cmCustomCommand::cmCustomCommand() : Backtrace() { @@ -25,7 +24,6 @@ cmCustomCommand::cmCustomCommand() this->UsesTerminal = false; } -//---------------------------------------------------------------------------- cmCustomCommand::cmCustomCommand(cmMakefile const* mf, const std::vector<std::string>& outputs, const std::vector<std::string>& byproducts, @@ -50,107 +48,90 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf, } } -//---------------------------------------------------------------------------- const std::vector<std::string>& cmCustomCommand::GetOutputs() const { return this->Outputs; } -//---------------------------------------------------------------------------- const std::vector<std::string>& cmCustomCommand::GetByproducts() const { return this->Byproducts; } -//---------------------------------------------------------------------------- const std::vector<std::string>& cmCustomCommand::GetDepends() const { return this->Depends; } -//---------------------------------------------------------------------------- const cmCustomCommandLines& cmCustomCommand::GetCommandLines() const { return this->CommandLines; } -//---------------------------------------------------------------------------- const char* cmCustomCommand::GetComment() const { const char* no_comment = 0; return this->HaveComment? this->Comment.c_str() : no_comment; } -//---------------------------------------------------------------------------- void cmCustomCommand::AppendCommands(const cmCustomCommandLines& commandLines) { this->CommandLines.insert(this->CommandLines.end(), commandLines.begin(), commandLines.end()); } -//---------------------------------------------------------------------------- void cmCustomCommand::AppendDepends(const std::vector<std::string>& depends) { this->Depends.insert(this->Depends.end(), depends.begin(), depends.end()); } -//---------------------------------------------------------------------------- bool cmCustomCommand::GetEscapeOldStyle() const { return this->EscapeOldStyle; } -//---------------------------------------------------------------------------- void cmCustomCommand::SetEscapeOldStyle(bool b) { this->EscapeOldStyle = b; } -//---------------------------------------------------------------------------- bool cmCustomCommand::GetEscapeAllowMakeVars() const { return this->EscapeAllowMakeVars; } -//---------------------------------------------------------------------------- void cmCustomCommand::SetEscapeAllowMakeVars(bool b) { this->EscapeAllowMakeVars = b; } -//---------------------------------------------------------------------------- cmListFileBacktrace const& cmCustomCommand::GetBacktrace() const { return this->Backtrace; } -//---------------------------------------------------------------------------- cmCustomCommand::ImplicitDependsList const& cmCustomCommand::GetImplicitDepends() const { return this->ImplicitDepends; } -//---------------------------------------------------------------------------- void cmCustomCommand::SetImplicitDepends(ImplicitDependsList const& l) { this->ImplicitDepends = l; } -//---------------------------------------------------------------------------- void cmCustomCommand::AppendImplicitDepends(ImplicitDependsList const& l) { this->ImplicitDepends.insert(this->ImplicitDepends.end(), l.begin(), l.end()); } -//---------------------------------------------------------------------------- bool cmCustomCommand::GetUsesTerminal() const { return this->UsesTerminal; } -//---------------------------------------------------------------------------- void cmCustomCommand::SetUsesTerminal(bool b) { this->UsesTerminal = b; diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index 81c5142..4a19160 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -17,7 +17,6 @@ #include "cmMakefile.h" #include "cmOutputConverter.h" -//---------------------------------------------------------------------------- cmCustomCommandGenerator::cmCustomCommandGenerator( cmCustomCommand const& cc, const std::string& config, cmLocalGenerator* lg): CC(cc), Config(config), LG(lg), @@ -26,19 +25,16 @@ cmCustomCommandGenerator::cmCustomCommandGenerator( { } -//---------------------------------------------------------------------------- cmCustomCommandGenerator::~cmCustomCommandGenerator() { delete this->GE; } -//---------------------------------------------------------------------------- unsigned int cmCustomCommandGenerator::GetNumberOfCommands() const { return static_cast<unsigned int>(this->CC.GetCommandLines().size()); } -//---------------------------------------------------------------------------- bool cmCustomCommandGenerator::UseCrossCompilingEmulator(unsigned int c) const { std::string const& argv0 = this->CC.GetCommandLines()[c][0]; @@ -51,7 +47,6 @@ bool cmCustomCommandGenerator::UseCrossCompilingEmulator(unsigned int c) const return false; } -//---------------------------------------------------------------------------- std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const { std::string const& argv0 = this->CC.GetCommandLines()[c][0]; @@ -78,7 +73,6 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const return exe; } -//---------------------------------------------------------------------------- std::string escapeForShellOldStyle(const std::string& str) { std::string result; @@ -107,7 +101,6 @@ std::string escapeForShellOldStyle(const std::string& str) #endif } -//---------------------------------------------------------------------------- void cmCustomCommandGenerator ::AppendArguments(unsigned int c, std::string& cmd) const @@ -136,31 +129,26 @@ cmCustomCommandGenerator } } -//---------------------------------------------------------------------------- const char* cmCustomCommandGenerator::GetComment() const { return this->CC.GetComment(); } -//---------------------------------------------------------------------------- std::string cmCustomCommandGenerator::GetWorkingDirectory() const { return this->CC.GetWorkingDirectory(); } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmCustomCommandGenerator::GetOutputs() const { return this->CC.GetOutputs(); } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmCustomCommandGenerator::GetByproducts() const { return this->CC.GetByproducts(); } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmCustomCommandGenerator::GetDepends() const { if (!this->DependsDone) diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx index b06fb5c..e8b898d 100644 --- a/Source/cmDefinitions.cxx +++ b/Source/cmDefinitions.cxx @@ -13,10 +13,8 @@ #include <assert.h> -//---------------------------------------------------------------------------- cmDefinitions::Def cmDefinitions::NoDef; -//---------------------------------------------------------------------------- cmDefinitions::Def const& cmDefinitions::GetInternal( const std::string& key, StackIter begin, StackIter end, bool raise) { @@ -41,7 +39,6 @@ cmDefinitions::Def const& cmDefinitions::GetInternal( return begin->Map.insert(MapType::value_type(key, def)).first->second; } -//---------------------------------------------------------------------------- const char* cmDefinitions::Get(const std::string& key, StackIter begin, StackIter end) { @@ -69,14 +66,12 @@ bool cmDefinitions::HasKey(const std::string& key, return false; } -//---------------------------------------------------------------------------- void cmDefinitions::Set(const std::string& key, const char* value) { Def def(value); this->Map[key] = def; } -//---------------------------------------------------------------------------- std::vector<std::string> cmDefinitions::UnusedKeys() const { std::vector<std::string> keys; @@ -93,7 +88,6 @@ std::vector<std::string> cmDefinitions::UnusedKeys() const return keys; } -//---------------------------------------------------------------------------- cmDefinitions cmDefinitions::MakeClosure(StackIter begin, StackIter end) { @@ -123,7 +117,6 @@ cmDefinitions cmDefinitions::MakeClosure(StackIter begin, return closure; } -//---------------------------------------------------------------------------- std::vector<std::string> cmDefinitions::ClosureKeys(StackIter begin, StackIter end) { diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index 40b552b..8686bcd 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -19,7 +19,6 @@ #include <cmsys/FStream.hxx> #include <string.h> -//---------------------------------------------------------------------------- cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir): CompileDirectory(), LocalGenerator(lg), @@ -32,14 +31,12 @@ cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir): { } -//---------------------------------------------------------------------------- cmDepends::~cmDepends() { delete [] this->Dependee; delete [] this->Depender; } -//---------------------------------------------------------------------------- bool cmDepends::Write(std::ostream &makeDepends, std::ostream &internalDepends) { @@ -76,14 +73,12 @@ bool cmDepends::Write(std::ostream &makeDepends, return this->Finalize(makeDepends, internalDepends); } -//---------------------------------------------------------------------------- bool cmDepends::Finalize(std::ostream&, std::ostream&) { return true; } -//---------------------------------------------------------------------------- bool cmDepends::Check(const char *makeFile, const char *internalFile, std::map<std::string, DependencyVector>& validDeps) { @@ -117,7 +112,6 @@ bool cmDepends::Check(const char *makeFile, const char *internalFile, return okay; } -//---------------------------------------------------------------------------- void cmDepends::Clear(const char *file) { // Print verbose output. @@ -135,7 +129,6 @@ void cmDepends::Clear(const char *file) << "# This may be replaced when dependencies are built." << std::endl; } -//---------------------------------------------------------------------------- bool cmDepends::WriteDependencies( const std::set<std::string>&, const std::string&, std::ostream&, std::ostream&) @@ -144,7 +137,6 @@ bool cmDepends::WriteDependencies( return false; } -//---------------------------------------------------------------------------- bool cmDepends::CheckDependencies(std::istream& internalDepends, const char* internalDependsFileName, std::map<std::string, DependencyVector>& validDeps) @@ -291,7 +283,6 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends, return okay; } -//---------------------------------------------------------------------------- void cmDepends::SetIncludePathFromLanguage(const std::string& lang) { // Look for the new per "TARGET_" variant first: diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 6bf815e..2fab890 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -29,13 +29,11 @@ #define INCLUDE_REGEX_COMPLAIN_MARKER "#IncludeRegexComplain: " #define INCLUDE_REGEX_TRANSFORM_MARKER "#IncludeRegexTransform: " -//---------------------------------------------------------------------------- cmDependsC::cmDependsC() : ValidDeps(0) { } -//---------------------------------------------------------------------------- cmDependsC::cmDependsC(cmLocalGenerator* lg, const char* targetDir, const std::string& lang, @@ -87,14 +85,12 @@ cmDependsC::cmDependsC(cmLocalGenerator* lg, this->ReadCacheFile(); } -//---------------------------------------------------------------------------- cmDependsC::~cmDependsC() { this->WriteCacheFile(); cmDeleteAll(this->FileCache); } -//---------------------------------------------------------------------------- bool cmDependsC::WriteDependencies(const std::set<std::string>& sources, const std::string& obj, std::ostream& makeDepends, @@ -292,7 +288,6 @@ bool cmDependsC::WriteDependencies(const std::set<std::string>& sources, return true; } -//---------------------------------------------------------------------------- void cmDependsC::ReadCacheFile() { if(this->CacheFileName.empty()) @@ -381,7 +376,6 @@ void cmDependsC::ReadCacheFile() } } -//---------------------------------------------------------------------------- void cmDependsC::WriteCacheFile() const { if(this->CacheFileName.empty()) @@ -426,7 +420,6 @@ void cmDependsC::WriteCacheFile() const } } -//---------------------------------------------------------------------------- void cmDependsC::Scan(std::istream& is, const char* directory, const std::string& fullName) { @@ -484,7 +477,6 @@ void cmDependsC::Scan(std::istream& is, const char* directory, } } -//---------------------------------------------------------------------------- void cmDependsC::SetupTransforms() { // Get the transformation rules. @@ -532,7 +524,6 @@ void cmDependsC::SetupTransforms() } } -//---------------------------------------------------------------------------- void cmDependsC::ParseTransform(std::string const& xform) { // A transform rule is of the form SOME_MACRO(%)=value-with-% @@ -547,7 +538,6 @@ void cmDependsC::ParseTransform(std::string const& xform) this->TransformRules[name] = value; } -//---------------------------------------------------------------------------- void cmDependsC::TransformLine(std::string& line) { // Check for a transform rule match. Return if none. diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index a7909b2..2e4a276 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -24,7 +24,6 @@ // use lower case and some always use upper case. I do not know if any // use the case from the source code. -//---------------------------------------------------------------------------- class cmDependsFortranInternals { public: @@ -55,13 +54,11 @@ public: } }; -//---------------------------------------------------------------------------- cmDependsFortran::cmDependsFortran(): Internal(0) { } -//---------------------------------------------------------------------------- cmDependsFortran ::cmDependsFortran(cmLocalGenerator* lg): cmDepends(lg), @@ -94,13 +91,11 @@ cmDependsFortran } } -//---------------------------------------------------------------------------- cmDependsFortran::~cmDependsFortran() { delete this->Internal; } -//---------------------------------------------------------------------------- bool cmDependsFortran::WriteDependencies( const std::set<std::string>& sources, const std::string& obj, std::ostream&, std::ostream&) @@ -143,7 +138,6 @@ bool cmDependsFortran::WriteDependencies( return okay; } -//---------------------------------------------------------------------------- bool cmDependsFortran::Finalize(std::ostream& makeDepends, std::ostream& internalDepends) { @@ -232,7 +226,6 @@ bool cmDependsFortran::Finalize(std::ostream& makeDepends, return true; } -//---------------------------------------------------------------------------- void cmDependsFortran::LocateModules() { // Collect the set of modules provided and required by all sources. @@ -283,7 +276,6 @@ void cmDependsFortran::LocateModules() } } -//---------------------------------------------------------------------------- void cmDependsFortran::MatchLocalModules() { const char* stampDir = this->TargetDirectory.c_str(); @@ -295,7 +287,6 @@ void cmDependsFortran::MatchLocalModules() } } -//---------------------------------------------------------------------------- void cmDependsFortran::MatchRemoteModules(std::istream& fin, const char* stampDir) { @@ -327,7 +318,6 @@ void cmDependsFortran::MatchRemoteModules(std::istream& fin, } } -//---------------------------------------------------------------------------- void cmDependsFortran::ConsiderModule(const char* name, const char* stampDir) { @@ -347,7 +337,6 @@ void cmDependsFortran::ConsiderModule(const char* name, } } -//---------------------------------------------------------------------------- bool cmDependsFortran ::WriteDependenciesReal(const char *obj, @@ -516,7 +505,6 @@ cmDependsFortran return true; } -//---------------------------------------------------------------------------- bool cmDependsFortran::FindModule(std::string const& name, std::string& module) { @@ -554,7 +542,6 @@ bool cmDependsFortran::FindModule(std::string const& name, return false; } -//---------------------------------------------------------------------------- bool cmDependsFortran::CopyModule(const std::vector<std::string>& args) { // Implements @@ -620,7 +607,6 @@ bool cmDependsFortran::CopyModule(const std::vector<std::string>& args) return false; } -//---------------------------------------------------------------------------- // Helper function to look for a short sequence in a stream. If this // is later used for longer sequences it should be re-written using an // efficient string search algorithm such as Boyer-Moore. @@ -656,7 +642,6 @@ bool cmFortranStreamContainsSequence(std::istream& ifs, return true; } -//---------------------------------------------------------------------------- // Helper function to compare the remaining content in two streams. static bool cmFortranStreamsDiffer(std::istream& ifs1, std::istream& ifs2) @@ -684,7 +669,6 @@ static bool cmFortranStreamsDiffer(std::istream& ifs1, return true; } -//---------------------------------------------------------------------------- bool cmDependsFortran::ModulesDiffer(const char* modFile, const char* stampFile, const char* compilerId) diff --git a/Source/cmDependsJava.cxx b/Source/cmDependsJava.cxx index 949d465..96f98dc 100644 --- a/Source/cmDependsJava.cxx +++ b/Source/cmDependsJava.cxx @@ -14,17 +14,14 @@ #include "cmDependsJavaParserHelper.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------------- cmDependsJava::cmDependsJava() { } -//---------------------------------------------------------------------------- cmDependsJava::~cmDependsJava() { } -//---------------------------------------------------------------------------- bool cmDependsJava::WriteDependencies(const std::set<std::string>& sources, const std::string&, std::ostream&, std::ostream&) { diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index 4e8bcb5..d3793c2 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -24,7 +24,6 @@ #include <algorithm> -//---------------------------------------------------------------------------- static const char *cmDocumentationStandardOptions[][2] = { {"--help,-help,-usage,-h,-H,/?", @@ -70,7 +69,6 @@ static const char *cmDocumentationStandardOptions[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char *cmDocumentationGeneratorsHeader[][2] = { {0, @@ -78,20 +76,17 @@ static const char *cmDocumentationGeneratorsHeader[][2] = {0,0} }; -//---------------------------------------------------------------------------- cmDocumentation::cmDocumentation() { this->addCommonStandardDocSections(); this->ShowGenerators = true; } -//---------------------------------------------------------------------------- cmDocumentation::~cmDocumentation() { cmDeleteAll(this->AllSections); } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintVersion(std::ostream& os) { /* clang-format off */ @@ -105,7 +100,6 @@ bool cmDocumentation::PrintVersion(std::ostream& os) return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintDocumentation(Type ht, std::ostream& os) { switch (ht) @@ -150,7 +144,6 @@ bool cmDocumentation::PrintDocumentation(Type ht, std::ostream& os) } } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintRequestedDocumentation(std::ostream& os) { int count = 0; @@ -233,7 +226,6 @@ void cmDocumentation::WarnFormFromFilename( } } -//---------------------------------------------------------------------------- void cmDocumentation::addCommonStandardDocSections() { cmDocumentationSection *sec; @@ -243,7 +235,6 @@ void cmDocumentation::addCommonStandardDocSections() this->AllSections["Options"] = sec; } -//---------------------------------------------------------------------------- void cmDocumentation::addCMakeStandardDocSections() { cmDocumentationSection *sec; @@ -253,7 +244,6 @@ void cmDocumentation::addCMakeStandardDocSections() this->AllSections["Generators"] = sec; } -//---------------------------------------------------------------------------- void cmDocumentation::addCTestStandardDocSections() { // This is currently done for backward compatibility reason @@ -261,7 +251,6 @@ void cmDocumentation::addCTestStandardDocSections() addCMakeStandardDocSections(); } -//---------------------------------------------------------------------------- void cmDocumentation::addCPackStandardDocSections() { cmDocumentationSection *sec; @@ -271,7 +260,6 @@ void cmDocumentation::addCPackStandardDocSections() this->AllSections["Generators"] = sec; } -//---------------------------------------------------------------------------- bool cmDocumentation::CheckOptions(int argc, const char* const* argv, const char* exitOpt) { @@ -482,13 +470,11 @@ bool cmDocumentation::CheckOptions(int argc, const char* const* argv, return result; } -//---------------------------------------------------------------------------- void cmDocumentation::SetName(const std::string& name) { this->NameString = name; } -//---------------------------------------------------------------------------- void cmDocumentation::SetSection(const char *name, cmDocumentationSection *section) { @@ -499,7 +485,6 @@ void cmDocumentation::SetSection(const char *name, this->AllSections[name] = section; } -//---------------------------------------------------------------------------- void cmDocumentation::SetSection(const char *name, std::vector<cmDocumentationEntry> &docs) { @@ -510,7 +495,6 @@ void cmDocumentation::SetSection(const char *name, this->SetSection(name,sec); } -//---------------------------------------------------------------------------- void cmDocumentation::SetSection(const char *name, const char *docs[][2]) { @@ -521,7 +505,6 @@ void cmDocumentation::SetSection(const char *name, this->SetSection(name,sec); } -//---------------------------------------------------------------------------- void cmDocumentation ::SetSections(std::map<std::string,cmDocumentationSection *> §ions) { @@ -532,7 +515,6 @@ void cmDocumentation } } -//---------------------------------------------------------------------------- void cmDocumentation::PrependSection(const char *name, const char *docs[][2]) { @@ -550,7 +532,6 @@ void cmDocumentation::PrependSection(const char *name, sec->Prepend(docs); } -//---------------------------------------------------------------------------- void cmDocumentation::PrependSection(const char *name, std::vector<cmDocumentationEntry> &docs) { @@ -568,7 +549,6 @@ void cmDocumentation::PrependSection(const char *name, sec->Prepend(docs); } -//---------------------------------------------------------------------------- void cmDocumentation::AppendSection(const char *name, const char *docs[][2]) { @@ -586,7 +566,6 @@ void cmDocumentation::AppendSection(const char *name, sec->Append(docs); } -//---------------------------------------------------------------------------- void cmDocumentation::AppendSection(const char *name, std::vector<cmDocumentationEntry> &docs) { @@ -604,7 +583,6 @@ void cmDocumentation::AppendSection(const char *name, sec->Append(docs); } -//---------------------------------------------------------------------------- void cmDocumentation::AppendSection(const char *name, cmDocumentationEntry &docs) { @@ -614,7 +592,6 @@ void cmDocumentation::AppendSection(const char *name, this->AppendSection(name,docsVec); } -//---------------------------------------------------------------------------- void cmDocumentation::PrependSection(const char *name, cmDocumentationEntry &docs) { @@ -624,7 +601,6 @@ void cmDocumentation::PrependSection(const char *name, this->PrependSection(name,docsVec); } -//---------------------------------------------------------------------------- void cmDocumentation::GlobHelp(std::vector<std::string>& files, std::string const& pattern) { @@ -637,7 +613,6 @@ void cmDocumentation::GlobHelp(std::vector<std::string>& files, } } -//---------------------------------------------------------------------------- void cmDocumentation::PrintNames(std::ostream& os, std::string const& pattern) { @@ -666,7 +641,6 @@ void cmDocumentation::PrintNames(std::ostream& os, } } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintFiles(std::ostream& os, std::string const& pattern) { @@ -683,13 +657,11 @@ bool cmDocumentation::PrintFiles(std::ostream& os, return found; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpFull(std::ostream& os) { return this->PrintFiles(os, "index"); } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpOneManual(std::ostream& os) { std::string mname = this->CurrentArgument; @@ -711,14 +683,12 @@ bool cmDocumentation::PrintHelpOneManual(std::ostream& os) return false; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpListManuals(std::ostream& os) { this->PrintNames(os, "manual/*"); return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpOneCommand(std::ostream& os) { std::string cname = cmSystemTools::LowerCase(this->CurrentArgument); @@ -733,14 +703,12 @@ bool cmDocumentation::PrintHelpOneCommand(std::ostream& os) return false; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpListCommands(std::ostream& os) { this->PrintNames(os, "command/*"); return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpOneModule(std::ostream& os) { std::string mname = this->CurrentArgument; @@ -754,7 +722,6 @@ bool cmDocumentation::PrintHelpOneModule(std::ostream& os) return false; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpListModules(std::ostream& os) { std::vector<std::string> files; @@ -775,7 +742,6 @@ bool cmDocumentation::PrintHelpListModules(std::ostream& os) return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpOneProperty(std::ostream& os) { std::string pname = cmSystemTools::HelpFileName(this->CurrentArgument); @@ -790,14 +756,12 @@ bool cmDocumentation::PrintHelpOneProperty(std::ostream& os) return false; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpListProperties(std::ostream& os) { this->PrintNames(os, "prop_*/*"); return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpOnePolicy(std::ostream& os) { std::string pname = this->CurrentArgument; @@ -813,14 +777,12 @@ bool cmDocumentation::PrintHelpOnePolicy(std::ostream& os) return false; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpListPolicies(std::ostream& os) { this->PrintNames(os, "policy/*"); return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpListGenerators(std::ostream& os) { std::map<std::string,cmDocumentationSection*>::iterator si; @@ -833,7 +795,6 @@ bool cmDocumentation::PrintHelpListGenerators(std::ostream& os) return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpOneVariable(std::ostream& os) { std::string vname = cmSystemTools::HelpFileName(this->CurrentArgument); @@ -848,14 +809,12 @@ bool cmDocumentation::PrintHelpOneVariable(std::ostream& os) return false; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelpListVariables(std::ostream& os) { this->PrintNames(os, "variable/*"); return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintUsage(std::ostream& os) { std::map<std::string,cmDocumentationSection*>::iterator si; @@ -867,7 +826,6 @@ bool cmDocumentation::PrintUsage(std::ostream& os) return true; } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintHelp(std::ostream& os) { std::map<std::string,cmDocumentationSection*>::iterator si; @@ -892,7 +850,6 @@ bool cmDocumentation::PrintHelp(std::ostream& os) return true; } -//---------------------------------------------------------------------------- const char* cmDocumentation::GetNameString() const { if(!this->NameString.empty()) @@ -905,14 +862,12 @@ const char* cmDocumentation::GetNameString() const } } -//---------------------------------------------------------------------------- bool cmDocumentation::IsOption(const char* arg) const { return ((arg[0] == '-') || (strcmp(arg, "/V") == 0) || (strcmp(arg, "/?") == 0)); } -//---------------------------------------------------------------------------- bool cmDocumentation::PrintOldCustomModules(std::ostream& os) { // CheckOptions abuses the Argument field to give us the file name. diff --git a/Source/cmDocumentationSection.cxx b/Source/cmDocumentationSection.cxx index b0dd8ef..2fbc50e 100644 --- a/Source/cmDocumentationSection.cxx +++ b/Source/cmDocumentationSection.cxx @@ -12,7 +12,6 @@ #include "cmDocumentationSection.h" -//---------------------------------------------------------------------------- void cmDocumentationSection::Append(const char *data[][2]) { int i = 0; @@ -24,7 +23,6 @@ void cmDocumentationSection::Append(const char *data[][2]) } } -//---------------------------------------------------------------------------- void cmDocumentationSection::Prepend(const char *data[][2]) { std::vector<cmDocumentationEntry> tmp; @@ -38,7 +36,6 @@ void cmDocumentationSection::Prepend(const char *data[][2]) this->Entries.insert(this->Entries.begin(),tmp.begin(),tmp.end()); } -//---------------------------------------------------------------------------- void cmDocumentationSection::Append(const char *n, const char *b) { this->Entries.push_back(cmDocumentationEntry(n,b)); diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 0e6f577..c6ae205 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -47,7 +47,6 @@ # include <sys/link.h> // For dynamic section information #endif -//---------------------------------------------------------------------------- // Low-level byte swapping implementation. template <size_t s> struct cmELFByteSwapSize {}; void cmELFByteSwap(char*, cmELFByteSwapSize<1> const&) @@ -80,7 +79,6 @@ void cmELFByteSwap(T& x) cmELFByteSwap(reinterpret_cast<char*>(&x), cmELFByteSwapSize<sizeof(T)>()); } -//---------------------------------------------------------------------------- class cmELFInternal { public: @@ -187,7 +185,6 @@ protected: std::map<unsigned int, StringEntry> DynamicSectionStrings; }; -//---------------------------------------------------------------------------- // Configure the implementation template for 32-bit ELF files. struct cmELFTypes32 { @@ -210,7 +207,6 @@ struct cmELFTypes64 static const char* GetName() { return "64-bit"; } }; -//---------------------------------------------------------------------------- // Parser implementation template. template <class Types> class cmELFInternalImpl: public cmELFInternal @@ -479,7 +475,6 @@ private: std::vector<ELF_Dyn> DynamicSectionEntries; }; -//---------------------------------------------------------------------------- template <class Types> cmELFInternalImpl<Types> ::cmELFInternalImpl(cmELF* external, @@ -548,7 +543,6 @@ cmELFInternalImpl<Types> } } -//---------------------------------------------------------------------------- template <class Types> bool cmELFInternalImpl<Types>::LoadDynamicSection() { @@ -593,7 +587,6 @@ bool cmELFInternalImpl<Types>::LoadDynamicSection() return true; } -//---------------------------------------------------------------------------- template <class Types> unsigned int cmELFInternalImpl<Types>::GetDynamicEntryCount() { @@ -611,7 +604,6 @@ unsigned int cmELFInternalImpl<Types>::GetDynamicEntryCount() return static_cast<unsigned int>(this->DynamicSectionEntries.size()); } -//---------------------------------------------------------------------------- template <class Types> unsigned long cmELFInternalImpl<Types>::GetDynamicEntryPosition(int j) { @@ -627,7 +619,6 @@ unsigned long cmELFInternalImpl<Types>::GetDynamicEntryPosition(int j) return static_cast<unsigned long>(sec.sh_offset + sec.sh_entsize*j); } -//---------------------------------------------------------------------------- template <class Types> cmELF::StringEntry const* cmELFInternalImpl<Types>::GetDynamicSectionString(unsigned int tag) @@ -730,7 +721,6 @@ cmELFInternalImpl<Types>::GetDynamicSectionString(unsigned int tag) //============================================================================ // External class implementation. -//---------------------------------------------------------------------------- cmELF::cmELF(const char* fname): Internal(0) { // Try to open the file. @@ -803,19 +793,16 @@ cmELF::cmELF(const char* fname): Internal(0) } } -//---------------------------------------------------------------------------- cmELF::~cmELF() { delete this->Internal; } -//---------------------------------------------------------------------------- bool cmELF::Valid() const { return this->Internal && this->Internal->GetFileType() != FileTypeInvalid; } -//---------------------------------------------------------------------------- cmELF::FileType cmELF::GetFileType() const { if(this->Valid()) @@ -828,7 +815,6 @@ cmELF::FileType cmELF::GetFileType() const } } -//---------------------------------------------------------------------------- unsigned int cmELF::GetNumberOfSections() const { if(this->Valid()) @@ -841,7 +827,6 @@ unsigned int cmELF::GetNumberOfSections() const } } -//---------------------------------------------------------------------------- unsigned int cmELF::GetDynamicEntryCount() const { if(this->Valid()) @@ -854,7 +839,6 @@ unsigned int cmELF::GetDynamicEntryCount() const } } -//---------------------------------------------------------------------------- unsigned long cmELF::GetDynamicEntryPosition(int index) const { if(this->Valid()) @@ -867,7 +851,6 @@ unsigned long cmELF::GetDynamicEntryPosition(int index) const } } -//---------------------------------------------------------------------------- bool cmELF::ReadBytes(unsigned long pos, unsigned long size, char* buf) const { if(this->Valid()) @@ -880,7 +863,6 @@ bool cmELF::ReadBytes(unsigned long pos, unsigned long size, char* buf) const } } -//---------------------------------------------------------------------------- bool cmELF::GetSOName(std::string& soname) { if(StringEntry const* se = this->GetSOName()) @@ -894,7 +876,6 @@ bool cmELF::GetSOName(std::string& soname) } } -//---------------------------------------------------------------------------- cmELF::StringEntry const* cmELF::GetSOName() { if(this->Valid() && @@ -908,7 +889,6 @@ cmELF::StringEntry const* cmELF::GetSOName() } } -//---------------------------------------------------------------------------- cmELF::StringEntry const* cmELF::GetRPath() { if(this->Valid() && @@ -923,7 +903,6 @@ cmELF::StringEntry const* cmELF::GetRPath() } } -//---------------------------------------------------------------------------- cmELF::StringEntry const* cmELF::GetRunPath() { if(this->Valid() && @@ -938,7 +917,6 @@ cmELF::StringEntry const* cmELF::GetRunPath() } } -//---------------------------------------------------------------------------- void cmELF::PrintInfo(std::ostream& os) const { if(this->Valid()) diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index 1731b91..a1e5010 100644 --- a/Source/cmExecuteProcessCommand.cxx +++ b/Source/cmExecuteProcessCommand.cxx @@ -384,7 +384,6 @@ bool cmExecuteProcessCommand return true; } -//---------------------------------------------------------------------------- void cmExecuteProcessCommandFixText(std::vector<char>& output, bool strip_trailing_whitespace) { @@ -418,7 +417,6 @@ void cmExecuteProcessCommandFixText(std::vector<char>& output, output.push_back('\0'); } -//---------------------------------------------------------------------------- void cmExecuteProcessCommandAppend(std::vector<char>& output, const char* data, int length) { diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index 87ea2c2..c1fa54b 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -16,14 +16,12 @@ #include "cmLocalGenerator.h" #include "cmTargetExport.h" -//---------------------------------------------------------------------------- cmExportBuildFileGenerator::cmExportBuildFileGenerator() { this->LG = 0; this->ExportSet = 0; } -//---------------------------------------------------------------------------- void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg) { this->LG = lg; @@ -33,7 +31,6 @@ void cmExportBuildFileGenerator::Compute(cmLocalGenerator* lg) } } -//---------------------------------------------------------------------------- bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os) { { @@ -132,7 +129,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os) return true; } -//---------------------------------------------------------------------------- void cmExportBuildFileGenerator ::GenerateImportTargetsConfig(std::ostream& os, @@ -179,13 +175,11 @@ cmExportBuildFileGenerator } } -//---------------------------------------------------------------------------- void cmExportBuildFileGenerator::SetExportSet(cmExportSet *exportSet) { this->ExportSet = exportSet; } -//---------------------------------------------------------------------------- void cmExportBuildFileGenerator ::SetImportLocationProperty(const std::string& config, @@ -227,7 +221,6 @@ cmExportBuildFileGenerator } } -//---------------------------------------------------------------------------- void cmExportBuildFileGenerator::HandleMissingTarget( std::string& link_libs, @@ -266,7 +259,6 @@ cmExportBuildFileGenerator::HandleMissingTarget( link_libs += dependee->GetExportName(); } -//---------------------------------------------------------------------------- void cmExportBuildFileGenerator ::GetTargets(std::vector<std::string> &targets) const { @@ -283,7 +275,6 @@ void cmExportBuildFileGenerator targets = this->Targets; } -//---------------------------------------------------------------------------- std::vector<std::string> cmExportBuildFileGenerator ::FindNamespaces(cmGlobalGenerator* gg, const std::string& name) @@ -308,7 +299,6 @@ cmExportBuildFileGenerator return namespaces; } -//---------------------------------------------------------------------------- void cmExportBuildFileGenerator ::ComplainAboutMissingTarget(cmGeneratorTarget* depender, diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index f66744e..ee8865e 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -250,7 +250,6 @@ bool cmExportCommand return true; } -//---------------------------------------------------------------------------- bool cmExportCommand::HandlePackage(std::vector<std::string> const& args) { // Parse PACKAGE mode arguments. @@ -314,7 +313,6 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args) #if defined(_WIN32) && !defined(__CYGWIN__) # include <windows.h> # undef GetCurrentDirectory -//---------------------------------------------------------------------------- void cmExportCommand::ReportRegistryError(std::string const& msg, std::string const& key, long err) @@ -334,7 +332,6 @@ void cmExportCommand::ReportRegistryError(std::string const& msg, this->Makefile->IssueMessage(cmake::WARNING, e.str()); } -//---------------------------------------------------------------------------- void cmExportCommand::StorePackageRegistryWin(std::string const& package, const char* content, const char* hash) @@ -367,7 +364,6 @@ void cmExportCommand::StorePackageRegistryWin(std::string const& package, } } #else -//---------------------------------------------------------------------------- void cmExportCommand::StorePackageRegistryDir(std::string const& package, const char* content, const char* hash) diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 67e17bb..5aa466d 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -28,7 +28,6 @@ #include <cmsys/FStream.hxx> #include <cmsys/auto_ptr.hxx> -//---------------------------------------------------------------------------- static std::string cmExportFileGeneratorEscape(std::string const& str) { // Escape a property value for writing into a .cmake file. @@ -43,20 +42,17 @@ static std::string cmExportFileGeneratorEscape(std::string const& str) return result; } -//---------------------------------------------------------------------------- cmExportFileGenerator::cmExportFileGenerator() { this->AppendMode = false; this->ExportOld = false; } -//---------------------------------------------------------------------------- void cmExportFileGenerator::AddConfiguration(const std::string& config) { this->Configurations.push_back(config); } -//---------------------------------------------------------------------------- void cmExportFileGenerator::SetExportFile(const char* mainFile) { this->MainImportFile = mainFile; @@ -68,13 +64,11 @@ void cmExportFileGenerator::SetExportFile(const char* mainFile) cmSystemTools::GetFilenameLastExtension(this->MainImportFile); } -//---------------------------------------------------------------------------- const char* cmExportFileGenerator::GetMainExportFileName() const { return this->MainImportFile.c_str(); } -//---------------------------------------------------------------------------- bool cmExportFileGenerator::GenerateImportFile() { // Open the output file to generate it. @@ -135,7 +129,6 @@ bool cmExportFileGenerator::GenerateImportFile() return result; } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateImportConfig(std::ostream& os, const std::string& config, std::vector<std::string> &missingTargets) @@ -155,7 +148,6 @@ void cmExportFileGenerator::GenerateImportConfig(std::ostream& os, this->GenerateImportTargetsConfig(os, config, suffix, missingTargets); } -//---------------------------------------------------------------------------- void cmExportFileGenerator::PopulateInterfaceProperty( const std::string& propName, cmGeneratorTarget *target, @@ -168,7 +160,6 @@ void cmExportFileGenerator::PopulateInterfaceProperty( } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::PopulateInterfaceProperty( const std::string& propName, const std::string& outputName, @@ -209,7 +200,6 @@ void cmExportFileGenerator::GenerateRequiredCMakeVersion(std::ostream& os, /* clang-format on */ } -//---------------------------------------------------------------------------- bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty( cmGeneratorTarget *target, cmGeneratorExpression::PreprocessContext preprocessRule, @@ -237,14 +227,12 @@ bool cmExportFileGenerator::PopulateInterfaceLinkLibrariesProperty( return false; } -//---------------------------------------------------------------------------- static bool isSubDirectory(const char* a, const char* b) { return (cmSystemTools::ComparePath(a, b) || cmSystemTools::IsSubDirectory(a, b)); } -//---------------------------------------------------------------------------- static bool checkInterfaceDirs(const std::string &prepro, cmGeneratorTarget *target, const std::string& prop) { @@ -379,7 +367,6 @@ static bool checkInterfaceDirs(const std::string &prepro, return !hadFatalError; } -//---------------------------------------------------------------------------- static void prefixItems(std::string &exportDirs) { std::vector<std::string> entries; @@ -400,7 +387,6 @@ static void prefixItems(std::string &exportDirs) } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::PopulateSourcesInterface( cmTargetExport *tei, cmGeneratorExpression::PreprocessContext preprocessRule, @@ -440,7 +426,6 @@ void cmExportFileGenerator::PopulateSourcesInterface( } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::PopulateIncludeDirectoriesInterface( cmTargetExport *tei, cmGeneratorExpression::PreprocessContext preprocessRule, @@ -508,7 +493,6 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface( } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::PopulateInterfaceProperty( const std::string& propName, cmGeneratorTarget* target, @@ -521,7 +505,6 @@ void cmExportFileGenerator::PopulateInterfaceProperty( } -//---------------------------------------------------------------------------- void getPropertyContents(cmGeneratorTarget const* tgt, const std::string& prop, std::set<std::string> &ifaceProperties) @@ -536,7 +519,6 @@ void getPropertyContents(cmGeneratorTarget const* tgt, ifaceProperties.insert(content.begin(), content.end()); } -//---------------------------------------------------------------------------- void getCompatibleInterfaceProperties(cmGeneratorTarget *target, std::set<std::string> &ifaceProperties, const std::string& config) @@ -578,7 +560,6 @@ void getCompatibleInterfaceProperties(cmGeneratorTarget *target, } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::PopulateCompatibleInterfaceProperties( cmGeneratorTarget *gtarget, ImportPropertyMap &properties) @@ -623,7 +604,6 @@ void cmExportFileGenerator::PopulateCompatibleInterfaceProperties( } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateInterfaceProperties( const cmGeneratorTarget* target, std::ostream& os, @@ -644,7 +624,6 @@ void cmExportFileGenerator::GenerateInterfaceProperties( } } -//---------------------------------------------------------------------------- bool cmExportFileGenerator::AddTargetNamespace(std::string &input, cmGeneratorTarget* target, @@ -679,7 +658,6 @@ cmExportFileGenerator::AddTargetNamespace(std::string &input, return true; } -//---------------------------------------------------------------------------- void cmExportFileGenerator::ResolveTargetsInGeneratorExpressions( std::string &input, @@ -716,7 +694,6 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpressions( } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::ResolveTargetsInGeneratorExpression( std::string &input, @@ -811,14 +788,12 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression( } } -//---------------------------------------------------------------------------- void cmExportFileGenerator::ReplaceInstallPrefix(std::string &) { // Do nothing } -//---------------------------------------------------------------------------- void cmExportFileGenerator ::SetImportLinkInterface(const std::string& config, std::string const& suffix, @@ -893,7 +868,6 @@ cmExportFileGenerator } } -//---------------------------------------------------------------------------- void cmExportFileGenerator ::SetImportDetailProperties(const std::string& config, @@ -956,7 +930,6 @@ cmExportFileGenerator } } -//---------------------------------------------------------------------------- template <typename T> void cmExportFileGenerator @@ -995,7 +968,6 @@ cmExportFileGenerator properties[prop] = link_entries; } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateImportHeaderCode(std::ostream& os, const std::string& config) { @@ -1014,14 +986,12 @@ void cmExportFileGenerator::GenerateImportHeaderCode(std::ostream& os, this->GenerateImportVersionCode(os); } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateImportFooterCode(std::ostream& os) { os << "# Commands beyond this point should not need to know the version.\n" << "set(CMAKE_IMPORT_FILE_VERSION)\n"; } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateImportVersionCode(std::ostream& os) { // Store an import file format version. This will let us change the @@ -1033,7 +1003,6 @@ void cmExportFileGenerator::GenerateImportVersionCode(std::ostream& os) /* clang-format on */ } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os, const std::string &expectedTargets) { @@ -1071,7 +1040,6 @@ void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os, "\n\n"; /* clang-format on */ } -//---------------------------------------------------------------------------- void cmExportFileGenerator ::GenerateImportTargetCode(std::ostream& os, const cmGeneratorTarget* target) @@ -1136,7 +1104,6 @@ cmExportFileGenerator os << "\n"; } -//---------------------------------------------------------------------------- void cmExportFileGenerator ::GenerateImportPropertyCode(std::ostream& os, const std::string& config, @@ -1174,7 +1141,6 @@ cmExportFileGenerator } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateMissingTargetsCheckCode(std::ostream& os, const std::vector<std::string>& missingTargets) { @@ -1229,7 +1195,6 @@ void cmExportFileGenerator::GenerateMissingTargetsCheckCode(std::ostream& os, } -//---------------------------------------------------------------------------- void cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os) { @@ -1265,7 +1230,6 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os) } -//---------------------------------------------------------------------------- void cmExportFileGenerator ::GenerateImportedFileChecksCode(std::ostream& os, cmGeneratorTarget* target, diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index da57fb7..2d454b9 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -21,14 +21,12 @@ #include "cmLocalGenerator.h" #include "cmTargetExport.h" -//---------------------------------------------------------------------------- cmExportInstallFileGenerator ::cmExportInstallFileGenerator(cmInstallExportGenerator* iegen): IEGen(iegen) { } -//---------------------------------------------------------------------------- std::string cmExportInstallFileGenerator::GetConfigImportFileGlob() { std::string glob = this->FileBase; @@ -37,7 +35,6 @@ std::string cmExportInstallFileGenerator::GetConfigImportFileGlob() return glob; } -//---------------------------------------------------------------------------- bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) { std::vector<cmTargetExport*> allTargets; @@ -258,7 +255,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) return result; } -//---------------------------------------------------------------------------- void cmExportInstallFileGenerator::ReplaceInstallPrefix(std::string &input) { @@ -273,7 +269,6 @@ cmExportInstallFileGenerator::ReplaceInstallPrefix(std::string &input) } } -//---------------------------------------------------------------------------- bool cmExportInstallFileGenerator::GenerateImportFileConfig( const std::string& config, @@ -328,7 +323,6 @@ cmExportInstallFileGenerator::GenerateImportFileConfig( return true; } -//---------------------------------------------------------------------------- void cmExportInstallFileGenerator ::GenerateImportTargetsConfig(std::ostream& os, @@ -390,7 +384,6 @@ cmExportInstallFileGenerator } } -//---------------------------------------------------------------------------- void cmExportInstallFileGenerator ::SetImportLocationProperty(const std::string& config, @@ -459,7 +452,6 @@ cmExportInstallFileGenerator } } -//---------------------------------------------------------------------------- void cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs, std::vector<std::string>& missingTargets, @@ -485,7 +477,6 @@ cmExportInstallFileGenerator::HandleMissingTarget(std::string& link_libs, } } -//---------------------------------------------------------------------------- std::vector<std::string> cmExportInstallFileGenerator ::FindNamespaces(cmGlobalGenerator* gg, const std::string& name) @@ -525,7 +516,6 @@ cmExportInstallFileGenerator return namespaces; } -//---------------------------------------------------------------------------- void cmExportInstallFileGenerator ::ComplainAboutMissingTarget(cmGeneratorTarget* depender, diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx index 5bafa1c..891af84 100644 --- a/Source/cmExportTryCompileFileGenerator.cxx +++ b/Source/cmExportTryCompileFileGenerator.cxx @@ -17,7 +17,6 @@ #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" -//---------------------------------------------------------------------------- cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator( cmGlobalGenerator* gg, const std::vector<std::string>& targets, @@ -98,7 +97,6 @@ std::string cmExportTryCompileFileGenerator::FindTargets( return result; } -//---------------------------------------------------------------------------- void cmExportTryCompileFileGenerator::PopulateProperties( const cmGeneratorTarget* target, diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index dc50b3e..53a9fdc 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -36,7 +36,6 @@ Discussion: http://forums.codeblocks.org/index.php/topic,6789.0.html */ -//---------------------------------------------------------------------------- void cmExtraCodeBlocksGenerator ::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const { diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 6c7d5f6..6ef2290 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -27,7 +27,6 @@ #include <cmsys/SystemInformation.hxx> #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------------- void cmExtraCodeLiteGenerator::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const { diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 40cc904..2b20e95 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -43,7 +43,6 @@ void AppendDictionary(cmXMLWriter& xml, const char* key, T const& value) xml.EndElement(); } -//---------------------------------------------------------------------------- cmExtraEclipseCDT4Generator ::cmExtraEclipseCDT4Generator() : cmExternalMakefileProjectGenerator() { @@ -65,7 +64,6 @@ cmExtraEclipseCDT4Generator this->CXXEnabled = false; } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator ::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const { @@ -73,7 +71,6 @@ void cmExtraEclipseCDT4Generator entry.Brief = "Generates Eclipse CDT 4.0 project files."; } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator ::EnableLanguage(std::vector<std::string> const& languages, cmMakefile *, bool) @@ -99,7 +96,6 @@ void cmExtraEclipseCDT4Generator } } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::Generate() { cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0]; @@ -213,7 +209,6 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile() } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::AddEnvVar(std::ostream& out, const char* envVar, cmLocalGenerator* lg) @@ -277,7 +272,6 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(std::ostream& out, } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::CreateProjectFile() { cmLocalGenerator* lg = this->GlobalGenerator->GetLocalGenerators()[0]; @@ -512,7 +506,6 @@ void cmExtraEclipseCDT4Generator::WriteGroups( } } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml) { std::string linkName = "[Targets]"; @@ -579,7 +572,6 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml) } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects( cmXMLWriter& xml, const std::string& baseDir) { @@ -619,7 +611,6 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects( } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::AppendIncludeDirectories( cmXMLWriter& xml, const std::vector<std::string>& includeDirs, @@ -657,7 +648,6 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories( } } -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator::CreateCProjectFile() const { std::set<std::string> emmited; @@ -1146,7 +1136,6 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const xml.EndElement(); // cproject } -//---------------------------------------------------------------------------- std::string cmExtraEclipseCDT4Generator::GetEclipsePath(const std::string& path) { @@ -1194,9 +1183,7 @@ cmExtraEclipseCDT4Generator::GenerateProjectName(const std::string& name, return name + (type.empty() ? "" : "-") + type + "@" + path; } -//---------------------------------------------------------------------------- // Helper functions -//---------------------------------------------------------------------------- void cmExtraEclipseCDT4Generator ::AppendStorageScanners(cmXMLWriter& xml, const cmMakefile& makefile) diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index d112fc9..f221604 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -22,7 +22,6 @@ #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------------- void cmExtraKateGenerator ::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const { diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index a8367c4..0f64eda 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -38,7 +38,6 @@ http://www.sublimetext.com/docs/2/projects.html http://sublimetext.info/docs/en/reference/build_systems.html */ -//---------------------------------------------------------------------------- void cmExtraSublimeTextGenerator ::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const { diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 41b0939..6b6b913 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -218,7 +218,6 @@ bool cmFileCommand return false; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args, bool append) { @@ -282,7 +281,6 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args, return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleReadCommand(std::vector<std::string> const& args) { if ( args.size() < 3 ) @@ -399,7 +397,6 @@ bool cmFileCommand::HandleReadCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args) { #if defined(CMAKE_BUILD_WITH_CMAKE) @@ -434,7 +431,6 @@ bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args) #endif } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args) { if(args.size() < 3) @@ -885,7 +881,6 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, bool recurse) { @@ -1070,7 +1065,6 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args, return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleMakeDirectoryCommand( std::vector<std::string> const& args) { @@ -1109,7 +1103,6 @@ bool cmFileCommand::HandleMakeDirectoryCommand( return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleDifferentCommand(std::vector<std::string> const& args) { @@ -1170,7 +1163,6 @@ cmFileCommand::HandleDifferentCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- // File installation helper class. struct cmFileCopier { @@ -1380,7 +1372,6 @@ protected: } }; -//---------------------------------------------------------------------------- bool cmFileCopier::Parse(std::vector<std::string> const& args) { this->Doing = DoingFiles; @@ -1427,7 +1418,6 @@ bool cmFileCopier::Parse(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmFileCopier::CheckKeyword(std::string const& arg) { if(arg == "DESTINATION") @@ -1540,7 +1530,6 @@ bool cmFileCopier::CheckKeyword(std::string const& arg) return true; } -//---------------------------------------------------------------------------- bool cmFileCopier::CheckValue(std::string const& arg) { switch(this->Doing) @@ -1633,7 +1622,6 @@ bool cmFileCopier::CheckValue(std::string const& arg) return true; } -//---------------------------------------------------------------------------- bool cmFileCopier::Run(std::vector<std::string> const& args) { if(!this->Parse(args)) @@ -1677,7 +1665,6 @@ bool cmFileCopier::Run(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmFileCopier::Install(const char* fromFile, const char* toFile) { if(!*fromFile) @@ -1716,7 +1703,6 @@ bool cmFileCopier::Install(const char* fromFile, const char* toFile) return this->ReportMissing(fromFile); } -//---------------------------------------------------------------------------- bool cmFileCopier::InstallSymlink(const char* fromFile, const char* toFile) { // Read the original symlink. @@ -1767,7 +1753,6 @@ bool cmFileCopier::InstallSymlink(const char* fromFile, const char* toFile) return true; } -//---------------------------------------------------------------------------- bool cmFileCopier::InstallFile(const char* fromFile, const char* toFile, MatchProperties const& match_properties) { @@ -1827,7 +1812,6 @@ bool cmFileCopier::InstallFile(const char* fromFile, const char* toFile, return this->SetPermissions(toFile, permissions); } -//---------------------------------------------------------------------------- bool cmFileCopier::InstallDirectory(const char* source, const char* destination, MatchProperties const& match_properties) @@ -1911,14 +1895,12 @@ bool cmFileCopier::InstallDirectory(const char* source, return this->SetPermissions(destination, permissions_after); } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleCopyCommand(std::vector<std::string> const& args) { cmFileCopier copier(this); return copier.Run(args); } -//---------------------------------------------------------------------------- struct cmFileInstaller: public cmFileCopier { cmFileInstaller(cmFileCommand* command): @@ -2031,7 +2013,6 @@ protected: bool HandleInstallDestination(); }; -//---------------------------------------------------------------------------- bool cmFileInstaller::Parse(std::vector<std::string> const& args) { if(!this->cmFileCopier::Parse(args)) @@ -2074,7 +2055,6 @@ bool cmFileInstaller::Parse(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmFileInstaller::CheckKeyword(std::string const& arg) { if(arg == "TYPE") @@ -2201,7 +2181,6 @@ bool cmFileInstaller::CheckKeyword(std::string const& arg) return true; } -//---------------------------------------------------------------------------- bool cmFileInstaller::CheckValue(std::string const& arg) { switch(this->Doing) @@ -2221,7 +2200,6 @@ bool cmFileInstaller::CheckValue(std::string const& arg) return true; } -//---------------------------------------------------------------------------- bool cmFileInstaller ::GetTargetTypeFromString(const std::string& stype) { @@ -2263,7 +2241,6 @@ bool cmFileInstaller return true; } -//---------------------------------------------------------------------------- bool cmFileInstaller::HandleInstallDestination() { std::string& destination = this->Destination; @@ -2359,7 +2336,6 @@ bool cmFileInstaller::HandleInstallDestination() return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleRPathChangeCommand(std::vector<std::string> const& args) { @@ -2466,7 +2442,6 @@ cmFileCommand::HandleRPathChangeCommand(std::vector<std::string> const& args) return success; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleRPathRemoveCommand(std::vector<std::string> const& args) { @@ -2539,7 +2514,6 @@ cmFileCommand::HandleRPathRemoveCommand(std::vector<std::string> const& args) return success; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleRPathCheckCommand(std::vector<std::string> const& args) { @@ -2599,14 +2573,12 @@ cmFileCommand::HandleRPathCheckCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleInstallCommand(std::vector<std::string> const& args) { cmFileInstaller installer(this); return installer.Run(args); } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleRelativePathCommand( std::vector<std::string> const& args) { @@ -2645,7 +2617,6 @@ bool cmFileCommand::HandleRelativePathCommand( } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleRename(std::vector<std::string> const& args) { if(args.size() != 3) @@ -2686,7 +2657,6 @@ bool cmFileCommand::HandleRename(std::vector<std::string> const& args) } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleRemove(std::vector<std::string> const& args, bool recurse) { @@ -2717,7 +2687,6 @@ bool cmFileCommand::HandleRemove(std::vector<std::string> const& args, return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleCMakePathCommand(std::vector<std::string> const& args, bool nativePath) @@ -3573,7 +3542,6 @@ cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args) #endif } -//---------------------------------------------------------------------------- void cmFileCommand::AddEvaluationFile(const std::string &inputName, const std::string &outputExpr, const std::string &condition, @@ -3594,7 +3562,6 @@ void cmFileCommand::AddEvaluationFile(const std::string &inputName, conditionCge, inputIsContent); } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleGenerateCommand( std::vector<std::string> const& args) { @@ -3642,7 +3609,6 @@ bool cmFileCommand::HandleGenerateCommand( return true; } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleLockCommand( std::vector<std::string> const& args) { @@ -3841,7 +3807,6 @@ bool cmFileCommand::HandleLockCommand( #endif } -//---------------------------------------------------------------------------- bool cmFileCommand::HandleTimestampCommand( std::vector<std::string> const& args) { diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx index 279b61d..88b5d99 100644 --- a/Source/cmFileTimeComparison.cxx +++ b/Source/cmFileTimeComparison.cxx @@ -32,7 +32,6 @@ # include <windows.h> #endif -//---------------------------------------------------------------------------- class cmFileTimeComparisonInternal { public: @@ -74,7 +73,6 @@ private: cmFileTimeComparison_Type* st2); }; -//---------------------------------------------------------------------------- bool cmFileTimeComparisonInternal::Stat(const char* fname, cmFileTimeComparison_Type* st) { @@ -118,32 +116,27 @@ bool cmFileTimeComparisonInternal::Stat(const char* fname, return true; } -//---------------------------------------------------------------------------- cmFileTimeComparison::cmFileTimeComparison() { this->Internals = new cmFileTimeComparisonInternal; } -//---------------------------------------------------------------------------- cmFileTimeComparison::~cmFileTimeComparison() { delete this->Internals; } -//---------------------------------------------------------------------------- bool cmFileTimeComparison::FileTimeCompare(const char* f1, const char* f2, int* result) { return this->Internals->FileTimeCompare(f1, f2, result); } -//---------------------------------------------------------------------------- bool cmFileTimeComparison::FileTimesDiffer(const char* f1, const char* f2) { return this->Internals->FileTimesDiffer(f1, f2); } -//---------------------------------------------------------------------------- int cmFileTimeComparisonInternal::Compare(cmFileTimeComparison_Type* s1, cmFileTimeComparison_Type* s2) { @@ -203,7 +196,6 @@ int cmFileTimeComparisonInternal::Compare(cmFileTimeComparison_Type* s1, #endif } -//---------------------------------------------------------------------------- bool cmFileTimeComparisonInternal::TimesDiffer(cmFileTimeComparison_Type* s1, cmFileTimeComparison_Type* s2) { @@ -280,7 +272,6 @@ bool cmFileTimeComparisonInternal::TimesDiffer(cmFileTimeComparison_Type* s1, #endif } -//---------------------------------------------------------------------------- bool cmFileTimeComparisonInternal::FileTimeCompare(const char* f1, const char* f2, int* result) @@ -303,7 +294,6 @@ bool cmFileTimeComparisonInternal::FileTimeCompare(const char* f1, } } -//---------------------------------------------------------------------------- bool cmFileTimeComparisonInternal::FileTimesDiffer(const char* f1, const char* f2) { diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index fa9b381..90091c1 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -22,7 +22,6 @@ cmFindBase::cmFindBase() this->NamesPerDirAllowed = false; } -//---------------------------------------------------------------------------- bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn) { if(argsIn.size() < 2 ) @@ -223,7 +222,6 @@ void cmFindBase::ExpandPaths() this->FillUserGuessPath(); } -//---------------------------------------------------------------------------- void cmFindBase::FillCMakeEnvironmentPath() { cmSearchPath &paths = this->LabeledPaths[PathLabel::CMakeEnvironment]; @@ -246,7 +244,6 @@ void cmFindBase::FillCMakeEnvironmentPath() paths.AddSuffixes(this->SearchPathSuffixes); } -//---------------------------------------------------------------------------- void cmFindBase::FillCMakeVariablePath() { cmSearchPath &paths = this->LabeledPaths[PathLabel::CMake]; @@ -271,7 +268,6 @@ void cmFindBase::FillCMakeVariablePath() paths.AddSuffixes(this->SearchPathSuffixes); } -//---------------------------------------------------------------------------- void cmFindBase::FillSystemEnvironmentPath() { cmSearchPath &paths = this->LabeledPaths[PathLabel::SystemEnvironment]; @@ -287,7 +283,6 @@ void cmFindBase::FillSystemEnvironmentPath() paths.AddSuffixes(this->SearchPathSuffixes); } -//---------------------------------------------------------------------------- void cmFindBase::FillCMakeSystemVariablePath() { cmSearchPath &paths = this->LabeledPaths[PathLabel::CMakeSystem]; @@ -309,7 +304,6 @@ void cmFindBase::FillCMakeSystemVariablePath() paths.AddSuffixes(this->SearchPathSuffixes); } -//---------------------------------------------------------------------------- void cmFindBase::FillUserHintsPath() { cmSearchPath &paths = this->LabeledPaths[PathLabel::Hints]; @@ -322,7 +316,6 @@ void cmFindBase::FillUserHintsPath() paths.AddSuffixes(this->SearchPathSuffixes); } -//---------------------------------------------------------------------------- void cmFindBase::FillUserGuessPath() { cmSearchPath &paths = this->LabeledPaths[PathLabel::Guess]; @@ -335,7 +328,6 @@ void cmFindBase::FillUserGuessPath() paths.AddSuffixes(this->SearchPathSuffixes); } -//---------------------------------------------------------------------------- void cmFindBase::PrintFindStuff() { std::cerr << "SearchFrameworkLast: " << this->SearchFrameworkLast << "\n"; diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index d70fa89..2758c18 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -14,7 +14,6 @@ #include <algorithm> #include <functional> -//---------------------------------------------------------------------------- cmFindCommon::PathGroup cmFindCommon::PathGroup::All("ALL"); cmFindCommon::PathLabel cmFindCommon::PathLabel::CMake("CMAKE"); cmFindCommon::PathLabel @@ -25,7 +24,6 @@ cmFindCommon::PathLabel cmFindCommon::PathLabel cmFindCommon::PathLabel::CMakeSystem("CMAKE_SYSTEM"); cmFindCommon::PathLabel cmFindCommon::PathLabel::Guess("GUESS"); -//---------------------------------------------------------------------------- cmFindCommon::cmFindCommon() { this->FindRootPathMode = RootPathModeBoth; @@ -52,12 +50,10 @@ cmFindCommon::cmFindCommon() this->InitializeSearchPathGroups(); } -//---------------------------------------------------------------------------- cmFindCommon::~cmFindCommon() { } -//---------------------------------------------------------------------------- void cmFindCommon::InitializeSearchPathGroups() { std::vector<PathLabel>* labels; @@ -91,7 +87,6 @@ void cmFindCommon::InitializeSearchPathGroups() cmSearchPath(this))); } -//---------------------------------------------------------------------------- void cmFindCommon::SelectDefaultRootPathMode() { // Check the policy variable for this find command type. @@ -113,7 +108,6 @@ void cmFindCommon::SelectDefaultRootPathMode() } } -//---------------------------------------------------------------------------- void cmFindCommon::SelectDefaultMacMode() { std::string ff = this->Makefile->GetSafeDefinition("CMAKE_FIND_FRAMEWORK"); @@ -169,7 +163,6 @@ void cmFindCommon::SelectDefaultMacMode() } } -//---------------------------------------------------------------------------- void cmFindCommon::RerootPaths(std::vector<std::string>& paths) { #if 0 @@ -258,7 +251,6 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths) } } -//---------------------------------------------------------------------------- void cmFindCommon::FilterPaths(const std::vector<std::string>& inPaths, const std::set<std::string>& ignore, std::vector<std::string>& outPaths) @@ -273,7 +265,6 @@ void cmFindCommon::FilterPaths(const std::vector<std::string>& inPaths, } } -//---------------------------------------------------------------------------- void cmFindCommon::GetIgnoredPaths(std::vector<std::string>& ignore) { // null-terminated list of paths. @@ -301,7 +292,6 @@ void cmFindCommon::GetIgnoredPaths(std::vector<std::string>& ignore) } -//---------------------------------------------------------------------------- void cmFindCommon::GetIgnoredPaths(std::set<std::string>& ignore) { std::vector<std::string> ignoreVec; @@ -309,7 +299,6 @@ void cmFindCommon::GetIgnoredPaths(std::set<std::string>& ignore) ignore.insert(ignoreVec.begin(), ignoreVec.end()); } -//---------------------------------------------------------------------------- bool cmFindCommon::CheckCommonArgument(std::string const& arg) { if(arg == "NO_DEFAULT_PATH") @@ -354,7 +343,6 @@ bool cmFindCommon::CheckCommonArgument(std::string const& arg) return true; } -//---------------------------------------------------------------------------- void cmFindCommon::AddPathSuffix(std::string const& arg) { std::string suffix = arg; @@ -385,7 +373,6 @@ void cmFindCommon::AddPathSuffix(std::string const& arg) this->SearchPathSuffixes.push_back(suffix); } -//---------------------------------------------------------------------------- void AddTrailingSlash(std::string& s) { if(!s.empty() && *s.rbegin() != '/') @@ -416,7 +403,6 @@ void cmFindCommon::ComputeFinalPaths() &AddTrailingSlash); } -//---------------------------------------------------------------------------- void cmFindCommon::SetMakefile(cmMakefile* makefile) { cmCommand::SetMakefile(makefile); diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index 91c7b5c..a37b0bd 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -82,7 +82,6 @@ bool cmFindLibraryCommand return true; } -//---------------------------------------------------------------------------- void cmFindLibraryCommand::AddArchitecturePaths(const char* suffix) { std::vector<std::string> original; @@ -94,7 +93,6 @@ void cmFindLibraryCommand::AddArchitecturePaths(const char* suffix) } } -//---------------------------------------------------------------------------- void cmFindLibraryCommand::AddArchitecturePath( std::string const& dir, std::string::size_type start_pos, const char* suffix, bool fresh) @@ -136,7 +134,6 @@ void cmFindLibraryCommand::AddArchitecturePath( } } -//---------------------------------------------------------------------------- std::string cmFindLibraryCommand::FindLibrary() { std::string library; @@ -155,7 +152,6 @@ std::string cmFindLibraryCommand::FindLibrary() return library; } -//---------------------------------------------------------------------------- struct cmFindLibraryHelper { cmFindLibraryHelper(cmMakefile* mf); @@ -209,7 +205,6 @@ struct cmFindLibraryHelper bool CheckDirectoryForName(std::string const& path, Name& name); }; -//---------------------------------------------------------------------------- cmFindLibraryHelper::cmFindLibraryHelper(cmMakefile* mf): Makefile(mf) { @@ -231,7 +226,6 @@ cmFindLibraryHelper::cmFindLibraryHelper(cmMakefile* mf): ->GetGlobalPropertyAsBool("FIND_LIBRARY_USE_OPENBSD_VERSIONING"); } -//---------------------------------------------------------------------------- void cmFindLibraryHelper::RegexFromLiteral(std::string& out, std::string const& in) { @@ -252,7 +246,6 @@ void cmFindLibraryHelper::RegexFromLiteral(std::string& out, } } -//---------------------------------------------------------------------------- void cmFindLibraryHelper::RegexFromList(std::string& out, std::vector<std::string> const& in) { @@ -273,7 +266,6 @@ void cmFindLibraryHelper::RegexFromList(std::string& out, out += ")"; } -//---------------------------------------------------------------------------- bool cmFindLibraryHelper::HasValidSuffix(std::string const& name) { for(std::vector<std::string>::const_iterator si = this->Suffixes.begin(); @@ -300,7 +292,6 @@ bool cmFindLibraryHelper::HasValidSuffix(std::string const& name) return false; } -//---------------------------------------------------------------------------- void cmFindLibraryHelper::AddName(std::string const& name) { Name entry; @@ -323,14 +314,12 @@ void cmFindLibraryHelper::AddName(std::string const& name) this->Names.push_back(entry); } -//---------------------------------------------------------------------------- void cmFindLibraryHelper::SetName(std::string const& name) { this->Names.clear(); this->AddName(name); } -//---------------------------------------------------------------------------- bool cmFindLibraryHelper::CheckDirectory(std::string const& path) { for(std::vector<Name>::iterator i = this->Names.begin(); @@ -344,7 +333,6 @@ bool cmFindLibraryHelper::CheckDirectory(std::string const& path) return false; } -//---------------------------------------------------------------------------- bool cmFindLibraryHelper::CheckDirectoryForName(std::string const& path, Name& name) { @@ -423,7 +411,6 @@ bool cmFindLibraryHelper::CheckDirectoryForName(std::string const& path, return !this->BestPath.empty(); } -//---------------------------------------------------------------------------- std::string cmFindLibraryCommand::FindNormalLibrary() { if(this->NamesPerDir) @@ -436,7 +423,6 @@ std::string cmFindLibraryCommand::FindNormalLibrary() } } -//---------------------------------------------------------------------------- std::string cmFindLibraryCommand::FindNormalLibraryNamesPerDir() { // Search for all names in each directory. @@ -459,7 +445,6 @@ std::string cmFindLibraryCommand::FindNormalLibraryNamesPerDir() return ""; } -//---------------------------------------------------------------------------- std::string cmFindLibraryCommand::FindNormalLibraryDirsPerName() { // Search the entire path for each name. @@ -485,7 +470,6 @@ std::string cmFindLibraryCommand::FindNormalLibraryDirsPerName() return ""; } -//---------------------------------------------------------------------------- std::string cmFindLibraryCommand::FindFrameworkLibrary() { if(this->NamesPerDir) @@ -498,7 +482,6 @@ std::string cmFindLibraryCommand::FindFrameworkLibrary() } } -//---------------------------------------------------------------------------- std::string cmFindLibraryCommand::FindFrameworkLibraryNamesPerDir() { std::string fwPath; @@ -523,7 +506,6 @@ std::string cmFindLibraryCommand::FindFrameworkLibraryNamesPerDir() return ""; } -//---------------------------------------------------------------------------- std::string cmFindLibraryCommand::FindFrameworkLibraryDirsPerName() { std::string fwPath; diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 9e58f73..d08441b 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -26,7 +26,6 @@ #include <string.h> #endif -//---------------------------------------------------------------------------- cmFindPackageCommand::PathLabel cmFindPackageCommand::PathLabel::UserRegistry("PACKAGE_REGISTRY"); cmFindPackageCommand::PathLabel @@ -34,7 +33,6 @@ cmFindPackageCommand::PathLabel cmFindPackageCommand::PathLabel cmFindPackageCommand::PathLabel::SystemRegistry("SYSTEM_PACKAGE_REGISTRY"); -//---------------------------------------------------------------------------- cmFindPackageCommand::cmFindPackageCommand() { this->CMakePathName = "PACKAGE"; @@ -63,7 +61,6 @@ cmFindPackageCommand::cmFindPackageCommand() this->AppendSearchPathGroups(); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::AppendSearchPathGroups() { std::vector<cmFindCommon::PathLabel>* labels; @@ -88,7 +85,6 @@ void cmFindPackageCommand::AppendSearchPathGroups() cmSearchPath(this))); } -//---------------------------------------------------------------------------- bool cmFindPackageCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -525,7 +521,6 @@ bool cmFindPackageCommand } -//---------------------------------------------------------------------------- void cmFindPackageCommand::SetModuleVariables(const std::string& components) { this->AddFindDefinition("CMAKE_FIND_PACKAGE_NAME", this->Name.c_str()); @@ -578,7 +573,6 @@ void cmFindPackageCommand::SetModuleVariables(const std::string& components) } } -//---------------------------------------------------------------------------- void cmFindPackageCommand::AddFindDefinition(const std::string& var, const char* val) { @@ -594,7 +588,6 @@ void cmFindPackageCommand::AddFindDefinition(const std::string& var, this->Makefile->AddDefinition(var, val); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::RestoreFindDefinitions() { for(std::map<std::string, OriginalDef>::iterator @@ -612,7 +605,6 @@ void cmFindPackageCommand::RestoreFindDefinitions() } } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::FindModule(bool& found) { std::string module = "Find"; @@ -634,7 +626,6 @@ bool cmFindPackageCommand::FindModule(bool& found) return true; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::HandlePackageMode() { this->ConsideredConfigs.clear(); @@ -892,7 +883,6 @@ bool cmFindPackageCommand::HandlePackageMode() return result; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::FindConfig() { // Compute the set of search prefixes. @@ -952,7 +942,6 @@ bool cmFindPackageCommand::FindConfig() return found; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::FindPrefixedConfig() { std::vector<std::string>& prefixes = this->SearchPaths; @@ -967,7 +956,6 @@ bool cmFindPackageCommand::FindPrefixedConfig() return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::FindFrameworkConfig() { std::vector<std::string>& prefixes = this->SearchPaths; @@ -982,7 +970,6 @@ bool cmFindPackageCommand::FindFrameworkConfig() return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::FindAppBundleConfig() { std::vector<std::string>& prefixes = this->SearchPaths; @@ -997,7 +984,6 @@ bool cmFindPackageCommand::FindAppBundleConfig() return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::ReadListFile(const char* f, PolicyScopeRule psr) { const bool noPolicyScope = !this->PolicyScope || psr == NoPolicyScope; @@ -1012,7 +998,6 @@ bool cmFindPackageCommand::ReadListFile(const char* f, PolicyScopeRule psr) return false; } -//---------------------------------------------------------------------------- void cmFindPackageCommand::AppendToFoundProperty(bool found) { std::vector<std::string> foundContents; @@ -1067,7 +1052,6 @@ void cmFindPackageCommand::AppendToFoundProperty(bool found) ->SetGlobalProperty("PACKAGES_NOT_FOUND", tmp.c_str()); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::AppendSuccessInformation() { { @@ -1122,7 +1106,6 @@ void cmFindPackageCommand::AppendSuccessInformation() this->RestoreFindDefinitions(); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::ComputePrefixes() { if(!this->NoDefaultPath) @@ -1161,7 +1144,6 @@ void cmFindPackageCommand::ComputePrefixes() this->ComputeFinalPaths(); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesCMakeEnvironment() { cmSearchPath &paths = this->LabeledPaths[PathLabel::CMakeEnvironment]; @@ -1176,7 +1158,6 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment() paths.AddEnvPath("CMAKE_APPBUNDLE_PATH"); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesCMakeVariable() { cmSearchPath &paths = this->LabeledPaths[PathLabel::CMake]; @@ -1186,7 +1167,6 @@ void cmFindPackageCommand::FillPrefixesCMakeVariable() paths.AddCMakePath("CMAKE_APPBUNDLE_PATH"); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesSystemEnvironment() { cmSearchPath &paths = this->LabeledPaths[PathLabel::SystemEnvironment]; @@ -1212,7 +1192,6 @@ void cmFindPackageCommand::FillPrefixesSystemEnvironment() } } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesUserRegistry() { #if defined(_WIN32) && !defined(__CYGWIN__) @@ -1240,7 +1219,6 @@ void cmFindPackageCommand::FillPrefixesUserRegistry() #endif } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesSystemRegistry() { if(this->NoSystemRegistry || this->NoDefaultPath) @@ -1263,7 +1241,6 @@ void cmFindPackageCommand::FillPrefixesSystemRegistry() # if !defined(KEY_WOW64_64KEY) # define KEY_WOW64_64KEY 0x0100 # endif -//---------------------------------------------------------------------------- void cmFindPackageCommand::LoadPackageRegistryWinUser() { // HKEY_CURRENT_USER\\Software shares 32-bit and 64-bit views. @@ -1271,7 +1248,6 @@ void cmFindPackageCommand::LoadPackageRegistryWinUser() this->LabeledPaths[PathLabel::UserRegistry]); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::LoadPackageRegistryWinSystem() { cmSearchPath &paths = this->LabeledPaths[PathLabel::SystemRegistry]; @@ -1290,7 +1266,6 @@ void cmFindPackageCommand::LoadPackageRegistryWinSystem() } } -//---------------------------------------------------------------------------- void cmFindPackageCommand::LoadPackageRegistryWin(bool user, unsigned int view, cmSearchPath& outPaths) { @@ -1349,7 +1324,6 @@ void cmFindPackageCommand::LoadPackageRegistryWin(bool user, unsigned int view, } } #else -//---------------------------------------------------------------------------- class cmFindPackageCommandHoldFile { const char* File; @@ -1360,7 +1334,6 @@ public: void Release() { this->File = 0; } }; -//---------------------------------------------------------------------------- void cmFindPackageCommand::LoadPackageRegistryDir(std::string const& dir, cmSearchPath& outPaths) { @@ -1398,7 +1371,6 @@ void cmFindPackageCommand::LoadPackageRegistryDir(std::string const& dir, } #endif -//---------------------------------------------------------------------------- bool cmFindPackageCommand::CheckPackageRegistryEntry(const std::string& fname, cmSearchPath& outPaths) { @@ -1437,7 +1409,6 @@ bool cmFindPackageCommand::CheckPackageRegistryEntry(const std::string& fname, } } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesCMakeSystemVariable() { cmSearchPath &paths = this->LabeledPaths[PathLabel::CMakeSystem]; @@ -1447,7 +1418,6 @@ void cmFindPackageCommand::FillPrefixesCMakeSystemVariable() paths.AddCMakePath("CMAKE_SYSTEM_APPBUNDLE_PATH"); } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesUserGuess() { cmSearchPath &paths = this->LabeledPaths[PathLabel::Guess]; @@ -1459,7 +1429,6 @@ void cmFindPackageCommand::FillPrefixesUserGuess() } } -//---------------------------------------------------------------------------- void cmFindPackageCommand::FillPrefixesUserHints() { cmSearchPath &paths = this->LabeledPaths[PathLabel::Hints]; @@ -1471,7 +1440,6 @@ void cmFindPackageCommand::FillPrefixesUserHints() } } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::SearchDirectory(std::string const& dir) { assert(!dir.empty() && dir[dir.size()-1] == '/'); @@ -1495,7 +1463,6 @@ bool cmFindPackageCommand::SearchDirectory(std::string const& dir) return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::CheckDirectory(std::string const& dir) { assert(!dir.empty() && dir[dir.size()-1] == '/'); @@ -1511,7 +1478,6 @@ bool cmFindPackageCommand::CheckDirectory(std::string const& dir) return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::FindConfigFile(std::string const& dir, std::string& file) { @@ -1539,7 +1505,6 @@ bool cmFindPackageCommand::FindConfigFile(std::string const& dir, return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::CheckVersion(std::string const& config_file) { bool result = false; // by default, assume the version is not ok. @@ -1585,7 +1550,6 @@ bool cmFindPackageCommand::CheckVersion(std::string const& config_file) return result; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file, std::string& result_version) { @@ -1670,7 +1634,6 @@ bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file, return suitable; } -//---------------------------------------------------------------------------- void cmFindPackageCommand::StoreVersionFound() { // Store the whole version string. @@ -1699,7 +1662,6 @@ void cmFindPackageCommand::StoreVersionFound() this->Makefile->AddDefinition(ver+"_COUNT", buf); } -//---------------------------------------------------------------------------- #include <cmsys/Glob.hxx> #include <cmsys/String.h> #include <cmsys/auto_ptr.hxx> @@ -2043,7 +2005,6 @@ private: } }; -//---------------------------------------------------------------------------- bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in) { assert(!prefix_in.empty() && prefix_in[prefix_in.size()-1] == '/'); @@ -2162,7 +2123,6 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in) return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in) { assert(!prefix_in.empty() && prefix_in[prefix_in.size()-1] == '/'); @@ -2233,7 +2193,6 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in) return false; } -//---------------------------------------------------------------------------- bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in) { assert(!prefix_in.empty() && prefix_in[prefix_in.size()-1] == '/'); diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx index 1f3d1a4..c34a98c 100644 --- a/Source/cmFindPathCommand.cxx +++ b/Source/cmFindPathCommand.cxx @@ -65,7 +65,6 @@ bool cmFindPathCommand return true; } -//---------------------------------------------------------------------------- std::string cmFindPathCommand::FindHeader() { std::string header; @@ -146,7 +145,6 @@ cmFindPathCommand::FindHeaderInFramework(std::string const& file, return ""; } -//---------------------------------------------------------------------------- std::string cmFindPathCommand::FindNormalHeader() { std::string tryPath; @@ -175,7 +173,6 @@ std::string cmFindPathCommand::FindNormalHeader() return ""; } -//---------------------------------------------------------------------------- std::string cmFindPathCommand::FindFrameworkHeader() { for(std::vector<std::string>::const_iterator ni = this->Names.begin(); diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx index 1734c01..423bf62 100644 --- a/Source/cmFindProgramCommand.cxx +++ b/Source/cmFindProgramCommand.cxx @@ -17,7 +17,6 @@ #include <CoreFoundation/CoreFoundation.h> #endif -//---------------------------------------------------------------------------- struct cmFindProgramHelper { cmFindProgramHelper() @@ -154,7 +153,6 @@ std::string cmFindProgramCommand::FindProgram() return program; } -//---------------------------------------------------------------------------- std::string cmFindProgramCommand::FindNormalProgram() { if(this->NamesPerDir) @@ -167,7 +165,6 @@ std::string cmFindProgramCommand::FindNormalProgram() } } -//---------------------------------------------------------------------------- std::string cmFindProgramCommand::FindNormalProgramNamesPerDir() { // Search for all names in each directory. @@ -197,7 +194,6 @@ std::string cmFindProgramCommand::FindNormalProgramNamesPerDir() return ""; } -//---------------------------------------------------------------------------- std::string cmFindProgramCommand::FindNormalProgramDirsPerName() { // Search the entire path for each name. diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx index e983bfb..b138e33 100644 --- a/Source/cmForEachCommand.cxx +++ b/Source/cmForEachCommand.cxx @@ -216,7 +216,6 @@ bool cmForEachCommand return true; } -//---------------------------------------------------------------------------- bool cmForEachCommand::HandleInMode(std::vector<std::string> const& args) { cmsys::auto_ptr<cmForEachFunctionBlocker> diff --git a/Source/cmFortranParser.h b/Source/cmFortranParser.h index cdaf46b..2ad951e 100644 --- a/Source/cmFortranParser.h +++ b/Source/cmFortranParser.h @@ -102,7 +102,6 @@ int cmFortran_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner) #if !defined(cmFortranLexer_cxx) && !defined(cmFortranParser_cxx) #include <stack> -//---------------------------------------------------------------------------- // Information about a single source file. class cmFortranSourceInfo { @@ -118,7 +117,6 @@ public: std::set<std::string> Includes; }; -//---------------------------------------------------------------------------- // Parser methods not included in generated interface. // Get the current buffer processed by the lexer. @@ -127,7 +125,6 @@ YY_BUFFER_STATE cmFortranLexer_GetCurrentBuffer(yyscan_t yyscanner); // The parser entry point. int cmFortran_yyparse(yyscan_t); -//---------------------------------------------------------------------------- // Define parser object internal structure. struct cmFortranFile { diff --git a/Source/cmFortranParserImpl.cxx b/Source/cmFortranParserImpl.cxx index b3b2f16..c26ad88 100644 --- a/Source/cmFortranParserImpl.cxx +++ b/Source/cmFortranParserImpl.cxx @@ -14,7 +14,6 @@ #include "cmSystemTools.h" #include <assert.h> -//---------------------------------------------------------------------------- bool cmFortranParser_s::FindIncludeFile(const char* dir, const char* includeName, std::string& fileName) @@ -55,7 +54,6 @@ bool cmFortranParser_s::FindIncludeFile(const char* dir, return false; } -//---------------------------------------------------------------------------- cmFortranParser_s ::cmFortranParser_s(std::vector<std::string> const& includes, std::set<std::string> const& defines, @@ -76,13 +74,11 @@ cmFortranParser_s cmFortran_yy_switch_to_buffer(buffer, this->Scanner); } -//---------------------------------------------------------------------------- cmFortranParser_s::~cmFortranParser_s() { cmFortran_yylex_destroy(this->Scanner); } -//---------------------------------------------------------------------------- bool cmFortranParser_FilePush(cmFortranParser* parser, const char* fname) { @@ -106,7 +102,6 @@ bool cmFortranParser_FilePush(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- bool cmFortranParser_FilePop(cmFortranParser* parser) { // Pop one file off the stack and close it. Switch the lexer back @@ -127,7 +122,6 @@ bool cmFortranParser_FilePop(cmFortranParser* parser) } } -//---------------------------------------------------------------------------- int cmFortranParser_Input(cmFortranParser* parser, char* buffer, size_t bufferSize) { @@ -141,26 +135,22 @@ int cmFortranParser_Input(cmFortranParser* parser, return 0; } -//---------------------------------------------------------------------------- void cmFortranParser_StringStart(cmFortranParser* parser) { parser->TokenString = ""; } -//---------------------------------------------------------------------------- const char* cmFortranParser_StringEnd(cmFortranParser* parser) { return parser->TokenString.c_str(); } -//---------------------------------------------------------------------------- void cmFortranParser_StringAppend(cmFortranParser* parser, char c) { parser->TokenString += c; } -//---------------------------------------------------------------------------- void cmFortranParser_SetInInterface(cmFortranParser* parser, bool in) { @@ -172,26 +162,22 @@ void cmFortranParser_SetInInterface(cmFortranParser* parser, parser->InInterface = in; } -//---------------------------------------------------------------------------- bool cmFortranParser_GetInInterface(cmFortranParser* parser) { return parser->InInterface; } -//---------------------------------------------------------------------------- void cmFortranParser_SetOldStartcond(cmFortranParser* parser, int arg) { parser->OldStartcond = arg; } -//---------------------------------------------------------------------------- int cmFortranParser_GetOldStartcond(cmFortranParser* parser) { return parser->OldStartcond; } -//---------------------------------------------------------------------------- void cmFortranParser_Error(cmFortranParser*, const char*) { // If there is a parser error just ignore it. The source will not @@ -199,7 +185,6 @@ void cmFortranParser_Error(cmFortranParser*, const char*) // to be regenerated anyway. } -//---------------------------------------------------------------------------- void cmFortranParser_RuleUse(cmFortranParser* parser, const char* name) { @@ -209,7 +194,6 @@ void cmFortranParser_RuleUse(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleLineDirective(cmFortranParser* parser, const char* filename) { @@ -235,7 +219,6 @@ void cmFortranParser_RuleLineDirective(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleInclude(cmFortranParser* parser, const char* name) { @@ -266,7 +249,6 @@ void cmFortranParser_RuleInclude(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleModule(cmFortranParser* parser, const char* name) { @@ -276,7 +258,6 @@ void cmFortranParser_RuleModule(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleDefine(cmFortranParser* parser, const char* macro) { @@ -286,7 +267,6 @@ void cmFortranParser_RuleDefine(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleUndef(cmFortranParser* parser, const char* macro) { @@ -301,7 +281,6 @@ void cmFortranParser_RuleUndef(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleIfdef(cmFortranParser* parser, const char* macro) { @@ -322,7 +301,6 @@ void cmFortranParser_RuleIfdef(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleIfndef(cmFortranParser* parser, const char* macro) { @@ -344,7 +322,6 @@ void cmFortranParser_RuleIfndef(cmFortranParser* parser, } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleIf(cmFortranParser* parser) { /* Note: The current parser is _not_ able to get statements like @@ -378,7 +355,6 @@ void cmFortranParser_RuleIf(cmFortranParser* parser) parser->SkipToEnd.push(false); } -//---------------------------------------------------------------------------- void cmFortranParser_RuleElif(cmFortranParser* parser) { /* Note: There are parser limitations. See the note at @@ -395,7 +371,6 @@ void cmFortranParser_RuleElif(cmFortranParser* parser) } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleElse(cmFortranParser* parser) { // if the parent branch is false do nothing! @@ -417,7 +392,6 @@ void cmFortranParser_RuleElse(cmFortranParser* parser) } } -//---------------------------------------------------------------------------- void cmFortranParser_RuleEndif(cmFortranParser* parser) { if(!parser->SkipToEnd.empty()) diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx index 600b793..78d863c 100644 --- a/Source/cmGeneratedFileStream.cxx +++ b/Source/cmGeneratedFileStream.cxx @@ -17,13 +17,11 @@ # include <cm_zlib.h> #endif -//---------------------------------------------------------------------------- cmGeneratedFileStream::cmGeneratedFileStream(): cmGeneratedFileStreamBase(), Stream() { } -//---------------------------------------------------------------------------- cmGeneratedFileStream::cmGeneratedFileStream(const char* name, bool quiet): cmGeneratedFileStreamBase(name), Stream(TempName.c_str()) @@ -37,7 +35,6 @@ cmGeneratedFileStream::cmGeneratedFileStream(const char* name, bool quiet): } } -//---------------------------------------------------------------------------- cmGeneratedFileStream::~cmGeneratedFileStream() { // This is the first destructor called. Check the status of the @@ -48,7 +45,6 @@ cmGeneratedFileStream::~cmGeneratedFileStream() this->Okay = (*this)?true:false; } -//---------------------------------------------------------------------------- cmGeneratedFileStream& cmGeneratedFileStream::Open(const char* name, bool quiet, bool binaryFlag) { @@ -76,7 +72,6 @@ cmGeneratedFileStream::Open(const char* name, bool quiet, bool binaryFlag) return *this; } -//---------------------------------------------------------------------------- bool cmGeneratedFileStream::Close() { @@ -90,25 +85,21 @@ cmGeneratedFileStream::Close() return this->cmGeneratedFileStreamBase::Close(); } -//---------------------------------------------------------------------------- void cmGeneratedFileStream::SetCopyIfDifferent(bool copy_if_different) { this->CopyIfDifferent = copy_if_different; } -//---------------------------------------------------------------------------- void cmGeneratedFileStream::SetCompression(bool compression) { this->Compress = compression; } -//---------------------------------------------------------------------------- void cmGeneratedFileStream::SetCompressionExtraExtension(bool ext) { this->CompressExtraExtension = ext; } -//---------------------------------------------------------------------------- cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(): Name(), TempName(), @@ -119,7 +110,6 @@ cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(): { } -//---------------------------------------------------------------------------- cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(const char* name): Name(), TempName(), @@ -131,13 +121,11 @@ cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(const char* name): this->Open(name); } -//---------------------------------------------------------------------------- cmGeneratedFileStreamBase::~cmGeneratedFileStreamBase() { this->Close(); } -//---------------------------------------------------------------------------- void cmGeneratedFileStreamBase::Open(const char* name) { // Save the original name of the file. @@ -158,7 +146,6 @@ void cmGeneratedFileStreamBase::Open(const char* name) cmSystemTools::MakeDirectory(dir.c_str()); } -//---------------------------------------------------------------------------- bool cmGeneratedFileStreamBase::Close() { bool replaced = false; @@ -203,7 +190,6 @@ bool cmGeneratedFileStreamBase::Close() return replaced; } -//---------------------------------------------------------------------------- #ifdef CMAKE_BUILD_WITH_CMAKE int cmGeneratedFileStreamBase::CompressFile(const char* oldname, const char* newname) @@ -241,14 +227,12 @@ int cmGeneratedFileStreamBase::CompressFile(const char*, const char*) } #endif -//---------------------------------------------------------------------------- int cmGeneratedFileStreamBase::RenameFile(const char* oldname, const char* newname) { return cmSystemTools::RenameFile(oldname, newname); } -//---------------------------------------------------------------------------- void cmGeneratedFileStream::SetName(const std::string& fname) { this->Name = fname; diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index d0ed28d..0566662 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -20,14 +20,12 @@ #include "cmGeneratorExpressionLexer.h" #include "cmGeneratorExpressionParser.h" -//---------------------------------------------------------------------------- cmGeneratorExpression::cmGeneratorExpression( const cmListFileBacktrace& backtrace): Backtrace(backtrace) { } -//---------------------------------------------------------------------------- cmsys::auto_ptr<cmCompiledGeneratorExpression> cmGeneratorExpression::Parse(std::string const& input) { @@ -35,7 +33,6 @@ cmGeneratorExpression::Parse(std::string const& input) new cmCompiledGeneratorExpression(this->Backtrace, input)); } -//---------------------------------------------------------------------------- cmsys::auto_ptr<cmCompiledGeneratorExpression> cmGeneratorExpression::Parse(const char* input) { @@ -46,7 +43,6 @@ cmGeneratorExpression::~cmGeneratorExpression() { } -//---------------------------------------------------------------------------- const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg, const std::string& config, bool quiet, const cmGeneratorTarget* headTarget, @@ -62,7 +58,6 @@ const char *cmCompiledGeneratorExpression::Evaluate(cmLocalGenerator* lg, language); } -//---------------------------------------------------------------------------- const char *cmCompiledGeneratorExpression::Evaluate( cmLocalGenerator* lg, const std::string& config, bool quiet, const cmGeneratorTarget* headTarget, @@ -78,7 +73,6 @@ const char *cmCompiledGeneratorExpression::Evaluate( return this->EvaluateWithContext(context, dagChecker); } -//---------------------------------------------------------------------------- const char* cmCompiledGeneratorExpression::EvaluateWithContext( cmGeneratorExpressionContext& context, cmGeneratorExpressionDAGChecker *dagChecker) const @@ -144,13 +138,11 @@ cmCompiledGeneratorExpression::cmCompiledGeneratorExpression( } -//---------------------------------------------------------------------------- cmCompiledGeneratorExpression::~cmCompiledGeneratorExpression() { cmDeleteAll(this->Evaluators); } -//---------------------------------------------------------------------------- std::string cmGeneratorExpression::StripEmptyListElements( const std::string &input) { @@ -190,7 +182,6 @@ std::string cmGeneratorExpression::StripEmptyListElements( return result; } -//---------------------------------------------------------------------------- static std::string stripAllGeneratorExpressions(const std::string &input) { std::string result; @@ -236,7 +227,6 @@ static std::string stripAllGeneratorExpressions(const std::string &input) return cmGeneratorExpression::StripEmptyListElements(result); } -//---------------------------------------------------------------------------- static void prefixItems(const std::string &content, std::string &result, const std::string &prefix) { @@ -257,7 +247,6 @@ static void prefixItems(const std::string &content, std::string &result, } } -//---------------------------------------------------------------------------- static std::string stripExportInterface(const std::string &input, cmGeneratorExpression::PreprocessContext context, bool resolveRelative) @@ -351,7 +340,6 @@ static std::string stripExportInterface(const std::string &input, return cmGeneratorExpression::StripEmptyListElements(result); } -//---------------------------------------------------------------------------- void cmGeneratorExpression::Split(const std::string &input, std::vector<std::string> &output) { @@ -420,7 +408,6 @@ void cmGeneratorExpression::Split(const std::string &input, } } -//---------------------------------------------------------------------------- std::string cmGeneratorExpression::Preprocess(const std::string &input, PreprocessContext context, bool resolveRelative) @@ -438,7 +425,6 @@ std::string cmGeneratorExpression::Preprocess(const std::string &input, return std::string(); } -//---------------------------------------------------------------------------- std::string::size_type cmGeneratorExpression::Find(const std::string &input) { const std::string::size_type openpos = input.find("$<"); @@ -450,7 +436,6 @@ std::string::size_type cmGeneratorExpression::Find(const std::string &input) return std::string::npos; } -//---------------------------------------------------------------------------- bool cmGeneratorExpression::IsValidTargetName(const std::string &input) { // The ':' is supported to allow use with IMPORTED targets. At least @@ -460,7 +445,6 @@ bool cmGeneratorExpression::IsValidTargetName(const std::string &input) return targetNameValidator.find(input); } -//---------------------------------------------------------------------------- void cmCompiledGeneratorExpression::GetMaxLanguageStandard( const cmGeneratorTarget* tgt, diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h index 68cdf49..8228e89 100644 --- a/Source/cmGeneratorExpressionContext.h +++ b/Source/cmGeneratorExpressionContext.h @@ -21,7 +21,6 @@ class cmGeneratorTarget; class cmLocalGenerator; -//---------------------------------------------------------------------------- struct cmGeneratorExpressionContext { cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string const& config, diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index fe45e43..17bafde 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -15,7 +15,6 @@ #include "cmAlgorithms.h" #include "cmLocalGenerator.h" -//---------------------------------------------------------------------------- cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( const cmListFileBacktrace &backtrace, const std::string &target, @@ -28,7 +27,6 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( Initialize(); } -//---------------------------------------------------------------------------- cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( const std::string &target, const std::string &property, @@ -40,7 +38,6 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( Initialize(); } -//---------------------------------------------------------------------------- void cmGeneratorExpressionDAGChecker::Initialize() { @@ -78,14 +75,12 @@ cmGeneratorExpressionDAGChecker::Initialize() } } -//---------------------------------------------------------------------------- cmGeneratorExpressionDAGChecker::Result cmGeneratorExpressionDAGChecker::Check() const { return this->CheckResult; } -//---------------------------------------------------------------------------- void cmGeneratorExpressionDAGChecker::ReportError( cmGeneratorExpressionContext *context, const std::string &expr) @@ -144,7 +139,6 @@ void cmGeneratorExpressionDAGChecker::ReportError( } } -//---------------------------------------------------------------------------- cmGeneratorExpressionDAGChecker::Result cmGeneratorExpressionDAGChecker::CheckGraph() const { @@ -160,7 +154,6 @@ cmGeneratorExpressionDAGChecker::CheckGraph() const return DAG; } -//---------------------------------------------------------------------------- bool cmGeneratorExpressionDAGChecker::GetTransitivePropertiesOnly() { const cmGeneratorExpressionDAGChecker *top = this; @@ -174,7 +167,6 @@ bool cmGeneratorExpressionDAGChecker::GetTransitivePropertiesOnly() return top->TransitivePropertiesOnly; } -//---------------------------------------------------------------------------- bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries(const char *tgt) { const cmGeneratorExpressionDAGChecker *top = this; diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h index 10f9fa7..c6c8901 100644 --- a/Source/cmGeneratorExpressionDAGChecker.h +++ b/Source/cmGeneratorExpressionDAGChecker.h @@ -38,7 +38,6 @@ #define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \ CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_SECOND) -//---------------------------------------------------------------------------- struct cmGeneratorExpressionDAGChecker { cmGeneratorExpressionDAGChecker(const cmListFileBacktrace &backtrace, diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx index 5d8050b..75ddd28 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.cxx +++ b/Source/cmGeneratorExpressionEvaluationFile.cxx @@ -21,7 +21,6 @@ #include <assert.h> -//---------------------------------------------------------------------------- cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile( const std::string &input, cmsys::auto_ptr<cmCompiledGeneratorExpression> outputFileExpr, @@ -34,7 +33,6 @@ cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile( { } -//---------------------------------------------------------------------------- void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg, const std::string& config, const std::string& lang, @@ -99,7 +97,6 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg, } } -//---------------------------------------------------------------------------- void cmGeneratorExpressionEvaluationFile::CreateOutputFile( cmLocalGenerator *lg, std::string const& config) { @@ -121,7 +118,6 @@ void cmGeneratorExpressionEvaluationFile::CreateOutputFile( } } -//---------------------------------------------------------------------------- void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg) { mode_t perm = 0; diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h index b8c824b..51aa51b 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.h +++ b/Source/cmGeneratorExpressionEvaluationFile.h @@ -19,7 +19,6 @@ class cmLocalGenerator; -//---------------------------------------------------------------------------- class cmGeneratorExpressionEvaluationFile { public: diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index d9dd3b1..5645e01 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -27,7 +27,6 @@ #include "cmGeneratorExpressionNode.h" -//---------------------------------------------------------------------------- GeneratorExpressionContent::GeneratorExpressionContent( const char *startContent, size_t length) @@ -36,13 +35,11 @@ GeneratorExpressionContent::GeneratorExpressionContent( } -//---------------------------------------------------------------------------- std::string GeneratorExpressionContent::GetOriginalExpression() const { return std::string(this->StartContent, this->ContentLength); } -//---------------------------------------------------------------------------- std::string GeneratorExpressionContent::ProcessArbitraryContent( const cmGeneratorExpressionNode *node, const std::string &identifier, @@ -93,7 +90,6 @@ std::string GeneratorExpressionContent::ProcessArbitraryContent( return result; } -//---------------------------------------------------------------------------- std::string GeneratorExpressionContent::Evaluate( cmGeneratorExpressionContext *context, cmGeneratorExpressionDAGChecker *dagChecker) const @@ -154,7 +150,6 @@ std::string GeneratorExpressionContent::Evaluate( return node->Evaluate(parameters, context, this, dagChecker); } -//---------------------------------------------------------------------------- std::string GeneratorExpressionContent::EvaluateParameters( const cmGeneratorExpressionNode *node, const std::string &identifier, @@ -244,7 +239,6 @@ std::string GeneratorExpressionContent::EvaluateParameters( return std::string(); } -//---------------------------------------------------------------------------- GeneratorExpressionContent::~GeneratorExpressionContent() { cmDeleteAll(this->IdentifierChildren); diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index b60bb5d..bce486b 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -22,7 +22,6 @@ struct cmGeneratorExpressionDAGChecker; struct cmGeneratorExpressionNode; -//---------------------------------------------------------------------------- struct cmGeneratorExpressionEvaluator { cmGeneratorExpressionEvaluator() {} @@ -78,7 +77,6 @@ private: size_t Length; }; -//---------------------------------------------------------------------------- struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator { GeneratorExpressionContent(const char *startContent, size_t length); diff --git a/Source/cmGeneratorExpressionLexer.cxx b/Source/cmGeneratorExpressionLexer.cxx index 1c83466..6a1ddf4 100644 --- a/Source/cmGeneratorExpressionLexer.cxx +++ b/Source/cmGeneratorExpressionLexer.cxx @@ -12,14 +12,12 @@ #include "cmGeneratorExpressionLexer.h" -//---------------------------------------------------------------------------- cmGeneratorExpressionLexer::cmGeneratorExpressionLexer() : SawBeginExpression(false), SawGeneratorExpression(false) { } -//---------------------------------------------------------------------------- static void InsertText(const char *upto, const char *c, std::vector<cmGeneratorExpressionToken> &result) { @@ -30,7 +28,6 @@ static void InsertText(const char *upto, const char *c, } } -//---------------------------------------------------------------------------- std::vector<cmGeneratorExpressionToken> cmGeneratorExpressionLexer::Tokenize(const std::string& input) { diff --git a/Source/cmGeneratorExpressionLexer.h b/Source/cmGeneratorExpressionLexer.h index 1e2e8c2..16f2794 100644 --- a/Source/cmGeneratorExpressionLexer.h +++ b/Source/cmGeneratorExpressionLexer.h @@ -16,7 +16,6 @@ #include <vector> -//---------------------------------------------------------------------------- struct cmGeneratorExpressionToken { cmGeneratorExpressionToken(unsigned type, const char *c, size_t l) diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 9f2272c..7bd2b1c 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -17,7 +17,6 @@ #include "cmMakefile.h" #include "cmOutputConverter.h" -//---------------------------------------------------------------------------- std::string cmGeneratorExpressionNode::EvaluateDependentExpression( std::string const& prop, cmLocalGenerator *lg, cmGeneratorExpressionContext *context, @@ -46,7 +45,6 @@ std::string cmGeneratorExpressionNode::EvaluateDependentExpression( return result; } -//---------------------------------------------------------------------------- static const struct ZeroNode : public cmGeneratorExpressionNode { ZeroNode() {} @@ -64,7 +62,6 @@ static const struct ZeroNode : public cmGeneratorExpressionNode } } zeroNode; -//---------------------------------------------------------------------------- static const struct OneNode : public cmGeneratorExpressionNode { OneNode() {} @@ -80,13 +77,10 @@ static const struct OneNode : public cmGeneratorExpressionNode } } oneNode; -//---------------------------------------------------------------------------- static const struct OneNode buildInterfaceNode; -//---------------------------------------------------------------------------- static const struct ZeroNode installInterfaceNode; -//---------------------------------------------------------------------------- #define BOOLEAN_OP_NODE(OPNAME, OP, SUCCESS_VALUE, FAILURE_VALUE) \ static const struct OP ## Node : public cmGeneratorExpressionNode \ { \ @@ -122,7 +116,6 @@ BOOLEAN_OP_NODE(orNode, OR, 0, 1) #undef BOOLEAN_OP_NODE -//---------------------------------------------------------------------------- static const struct NotNode : public cmGeneratorExpressionNode { NotNode() {} @@ -142,7 +135,6 @@ static const struct NotNode : public cmGeneratorExpressionNode } } notNode; -//---------------------------------------------------------------------------- static const struct BoolNode : public cmGeneratorExpressionNode { BoolNode() {} @@ -158,7 +150,6 @@ static const struct BoolNode : public cmGeneratorExpressionNode } } boolNode; -//---------------------------------------------------------------------------- static const struct StrEqualNode : public cmGeneratorExpressionNode { StrEqualNode() {} @@ -174,7 +165,6 @@ static const struct StrEqualNode : public cmGeneratorExpressionNode } } strEqualNode; -//---------------------------------------------------------------------------- static const struct EqualNode : public cmGeneratorExpressionNode { EqualNode() {} @@ -260,7 +250,6 @@ static const struct EqualNode : public cmGeneratorExpressionNode } } equalNode; -//---------------------------------------------------------------------------- static const struct LowerCaseNode : public cmGeneratorExpressionNode { LowerCaseNode() {} @@ -276,7 +265,6 @@ static const struct LowerCaseNode : public cmGeneratorExpressionNode } } lowerCaseNode; -//---------------------------------------------------------------------------- static const struct UpperCaseNode : public cmGeneratorExpressionNode { UpperCaseNode() {} @@ -292,7 +280,6 @@ static const struct UpperCaseNode : public cmGeneratorExpressionNode } } upperCaseNode; -//---------------------------------------------------------------------------- static const struct MakeCIdentifierNode : public cmGeneratorExpressionNode { MakeCIdentifierNode() {} @@ -308,7 +295,6 @@ static const struct MakeCIdentifierNode : public cmGeneratorExpressionNode } } makeCIdentifierNode; -//---------------------------------------------------------------------------- static const struct Angle_RNode : public cmGeneratorExpressionNode { Angle_RNode() {} @@ -324,7 +310,6 @@ static const struct Angle_RNode : public cmGeneratorExpressionNode } } angle_rNode; -//---------------------------------------------------------------------------- static const struct CommaNode : public cmGeneratorExpressionNode { CommaNode() {} @@ -340,7 +325,6 @@ static const struct CommaNode : public cmGeneratorExpressionNode } } commaNode; -//---------------------------------------------------------------------------- static const struct SemicolonNode : public cmGeneratorExpressionNode { SemicolonNode() {} @@ -356,7 +340,6 @@ static const struct SemicolonNode : public cmGeneratorExpressionNode } } semicolonNode; -//---------------------------------------------------------------------------- struct CompilerIdNode : public cmGeneratorExpressionNode { CompilerIdNode() {} @@ -417,7 +400,6 @@ struct CompilerIdNode : public cmGeneratorExpressionNode } }; -//---------------------------------------------------------------------------- static const struct CCompilerIdNode : public CompilerIdNode { CCompilerIdNode() {} @@ -439,7 +421,6 @@ static const struct CCompilerIdNode : public CompilerIdNode } } cCompilerIdNode; -//---------------------------------------------------------------------------- static const struct CXXCompilerIdNode : public CompilerIdNode { CXXCompilerIdNode() {} @@ -461,7 +442,6 @@ static const struct CXXCompilerIdNode : public CompilerIdNode } } cxxCompilerIdNode; -//---------------------------------------------------------------------------- struct CompilerVersionNode : public cmGeneratorExpressionNode { CompilerVersionNode() {} @@ -500,7 +480,6 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode } }; -//---------------------------------------------------------------------------- static const struct CCompilerVersionNode : public CompilerVersionNode { CCompilerVersionNode() {} @@ -522,7 +501,6 @@ static const struct CCompilerVersionNode : public CompilerVersionNode } } cCompilerVersionNode; -//---------------------------------------------------------------------------- static const struct CxxCompilerVersionNode : public CompilerVersionNode { CxxCompilerVersionNode() {} @@ -545,7 +523,6 @@ static const struct CxxCompilerVersionNode : public CompilerVersionNode } cxxCompilerVersionNode; -//---------------------------------------------------------------------------- struct PlatformIdNode : public cmGeneratorExpressionNode { PlatformIdNode() {} @@ -577,7 +554,6 @@ struct PlatformIdNode : public cmGeneratorExpressionNode } } platformIdNode; -//---------------------------------------------------------------------------- static const struct VersionGreaterNode : public cmGeneratorExpressionNode { VersionGreaterNode() {} @@ -595,7 +571,6 @@ static const struct VersionGreaterNode : public cmGeneratorExpressionNode } } versionGreaterNode; -//---------------------------------------------------------------------------- static const struct VersionLessNode : public cmGeneratorExpressionNode { VersionLessNode() {} @@ -613,7 +588,6 @@ static const struct VersionLessNode : public cmGeneratorExpressionNode } } versionLessNode; -//---------------------------------------------------------------------------- static const struct VersionEqualNode : public cmGeneratorExpressionNode { VersionEqualNode() {} @@ -631,7 +605,6 @@ static const struct VersionEqualNode : public cmGeneratorExpressionNode } } versionEqualNode; -//---------------------------------------------------------------------------- static const struct LinkOnlyNode : public cmGeneratorExpressionNode { LinkOnlyNode() {} @@ -649,7 +622,6 @@ static const struct LinkOnlyNode : public cmGeneratorExpressionNode } } linkOnlyNode; -//---------------------------------------------------------------------------- static const struct ConfigurationNode : public cmGeneratorExpressionNode { ConfigurationNode() {} @@ -666,7 +638,6 @@ static const struct ConfigurationNode : public cmGeneratorExpressionNode } } configurationNode; -//---------------------------------------------------------------------------- static const struct ConfigurationTestNode : public cmGeneratorExpressionNode { ConfigurationTestNode() {} @@ -824,7 +795,6 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode #define TRANSITIVE_PROPERTY_NAME(PROPERTY) \ , "INTERFACE_" #PROPERTY -//---------------------------------------------------------------------------- static const char* targetPropertyTransitiveWhitelist[] = { 0 CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(TRANSITIVE_PROPERTY_NAME) @@ -873,7 +843,6 @@ getLinkedTargetsContent( return linkedTargetsContent; } -//---------------------------------------------------------------------------- static const struct TargetPropertyNode : public cmGeneratorExpressionNode { TargetPropertyNode() {} @@ -1226,7 +1195,6 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode } } targetPropertyNode; -//---------------------------------------------------------------------------- static const struct TargetNameNode : public cmGeneratorExpressionNode { TargetNameNode() {} @@ -1248,7 +1216,6 @@ static const struct TargetNameNode : public cmGeneratorExpressionNode } targetNameNode; -//---------------------------------------------------------------------------- static const struct TargetObjectsNode : public cmGeneratorExpressionNode { TargetObjectsNode() {} @@ -1324,7 +1291,6 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode } } targetObjectsNode; -//---------------------------------------------------------------------------- static const struct CompileFeaturesNode : public cmGeneratorExpressionNode { CompileFeaturesNode() {} @@ -1427,7 +1393,6 @@ static const struct CompileFeaturesNode : public cmGeneratorExpressionNode } } compileFeaturesNode; -//---------------------------------------------------------------------------- static const char* targetPolicyWhitelist[] = { 0 #define TARGET_POLICY_STRING(POLICY) \ @@ -1471,7 +1436,6 @@ cmPolicies::PolicyID policyForString(const char *policy_id) return cmPolicies::CMP0002; } -//---------------------------------------------------------------------------- static const struct TargetPolicyNode : public cmGeneratorExpressionNode { TargetPolicyNode() {} @@ -1533,7 +1497,6 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode } targetPolicyNode; -//---------------------------------------------------------------------------- static const struct InstallPrefixNode : public cmGeneratorExpressionNode { InstallPrefixNode() {} @@ -1554,7 +1517,6 @@ static const struct InstallPrefixNode : public cmGeneratorExpressionNode } installPrefixNode; -//---------------------------------------------------------------------------- class ArtifactNameTag; class ArtifactLinkerTag; class ArtifactSonameTag; @@ -1563,7 +1525,6 @@ class ArtifactPdbTag; class ArtifactPathTag; class ArtifactDirTag; -//---------------------------------------------------------------------------- template<typename ArtifactT> struct TargetFilesystemArtifactResultCreator { @@ -1572,7 +1533,6 @@ struct TargetFilesystemArtifactResultCreator const GeneratorExpressionContent *content); }; -//---------------------------------------------------------------------------- template<> struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag> { @@ -1602,7 +1562,6 @@ struct TargetFilesystemArtifactResultCreator<ArtifactSonameTag> } }; -//---------------------------------------------------------------------------- template<> struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag> { @@ -1647,7 +1606,6 @@ struct TargetFilesystemArtifactResultCreator<ArtifactPdbTag> } }; -//---------------------------------------------------------------------------- template<> struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag> { @@ -1668,7 +1626,6 @@ struct TargetFilesystemArtifactResultCreator<ArtifactLinkerTag> } }; -//---------------------------------------------------------------------------- template<> struct TargetFilesystemArtifactResultCreator<ArtifactNameTag> { @@ -1681,14 +1638,12 @@ struct TargetFilesystemArtifactResultCreator<ArtifactNameTag> }; -//---------------------------------------------------------------------------- template<typename ArtifactT> struct TargetFilesystemArtifactResultGetter { static std::string Get(const std::string &result); }; -//---------------------------------------------------------------------------- template<> struct TargetFilesystemArtifactResultGetter<ArtifactNameTag> { @@ -1696,7 +1651,6 @@ struct TargetFilesystemArtifactResultGetter<ArtifactNameTag> { return cmSystemTools::GetFilenameName(result); } }; -//---------------------------------------------------------------------------- template<> struct TargetFilesystemArtifactResultGetter<ArtifactDirTag> { @@ -1704,7 +1658,6 @@ struct TargetFilesystemArtifactResultGetter<ArtifactDirTag> { return cmSystemTools::GetFilenamePath(result); } }; -//---------------------------------------------------------------------------- template<> struct TargetFilesystemArtifactResultGetter<ArtifactPathTag> { @@ -1712,7 +1665,6 @@ struct TargetFilesystemArtifactResultGetter<ArtifactPathTag> { return result; } }; -//---------------------------------------------------------------------------- template<typename ArtifactT, typename ComponentT> struct TargetFilesystemArtifact : public cmGeneratorExpressionNode { @@ -1775,7 +1727,6 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode } }; -//---------------------------------------------------------------------------- template<typename ArtifactT> struct TargetFilesystemArtifactNodeGroup { @@ -1788,7 +1739,6 @@ struct TargetFilesystemArtifactNodeGroup TargetFilesystemArtifact<ArtifactT, ArtifactDirTag> FileDir; }; -//---------------------------------------------------------------------------- static const TargetFilesystemArtifactNodeGroup<ArtifactNameTag> targetNodeGroup; @@ -1801,7 +1751,6 @@ TargetFilesystemArtifactNodeGroup<ArtifactSonameTag> targetSoNameNodeGroup; static const TargetFilesystemArtifactNodeGroup<ArtifactPdbTag> targetPdbNodeGroup; -//---------------------------------------------------------------------------- static const struct ShellPathNode : public cmGeneratorExpressionNode { ShellPathNode() {} @@ -1822,7 +1771,6 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode } } shellPathNode; -//---------------------------------------------------------------------------- const cmGeneratorExpressionNode* cmGeneratorExpressionNode::GetNode(const std::string &identifier) { @@ -1887,7 +1835,6 @@ cmGeneratorExpressionNode::GetNode(const std::string &identifier) return i->second; } -//---------------------------------------------------------------------------- void reportError(cmGeneratorExpressionContext *context, const std::string &expr, const std::string &result) { diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h index 2d66727..725ff01 100644 --- a/Source/cmGeneratorExpressionNode.h +++ b/Source/cmGeneratorExpressionNode.h @@ -27,7 +27,6 @@ #include "cmListFileCache.h" -//---------------------------------------------------------------------------- struct cmGeneratorExpressionNode { enum { @@ -63,7 +62,6 @@ struct cmGeneratorExpressionNode const std::string &identifier); }; -//---------------------------------------------------------------------------- void reportError(cmGeneratorExpressionContext *context, const std::string &expr, const std::string &result); diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx index a17da8c..f59405c 100644 --- a/Source/cmGeneratorExpressionParser.cxx +++ b/Source/cmGeneratorExpressionParser.cxx @@ -16,14 +16,12 @@ #include "assert.h" -//---------------------------------------------------------------------------- cmGeneratorExpressionParser::cmGeneratorExpressionParser( const std::vector<cmGeneratorExpressionToken> &tokens) : Tokens(tokens), NestingLevel(0) { } -//---------------------------------------------------------------------------- void cmGeneratorExpressionParser::Parse( std::vector<cmGeneratorExpressionEvaluator*> &result) { @@ -35,7 +33,6 @@ void cmGeneratorExpressionParser::Parse( } } -//---------------------------------------------------------------------------- static void extendText(std::vector<cmGeneratorExpressionEvaluator*> &result, std::vector<cmGeneratorExpressionToken>::const_iterator it) { @@ -53,7 +50,6 @@ static void extendText(std::vector<cmGeneratorExpressionEvaluator*> &result, } } -//---------------------------------------------------------------------------- static void extendResult(std::vector<cmGeneratorExpressionEvaluator*> &result, const std::vector<cmGeneratorExpressionEvaluator*> &contents) { @@ -73,7 +69,6 @@ static void extendResult(std::vector<cmGeneratorExpressionEvaluator*> &result, } } -//---------------------------------------------------------------------------- void cmGeneratorExpressionParser::ParseGeneratorExpression( std::vector<cmGeneratorExpressionEvaluator*> &result) { @@ -245,7 +240,6 @@ void cmGeneratorExpressionParser::ParseGeneratorExpression( result.push_back(content); } -//---------------------------------------------------------------------------- void cmGeneratorExpressionParser::ParseContent( std::vector<cmGeneratorExpressionEvaluator*> &result) { diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h index 5bd6777..3df7fed 100644 --- a/Source/cmGeneratorExpressionParser.h +++ b/Source/cmGeneratorExpressionParser.h @@ -21,7 +21,6 @@ struct cmGeneratorExpressionEvaluator; -//---------------------------------------------------------------------------- struct cmGeneratorExpressionParser { cmGeneratorExpressionParser( diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 0189d93..4ffe2f0 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -46,7 +46,6 @@ public: }; cmLinkImplItem cmGeneratorTarget::TargetPropertyEntry::NoLinkImplItem; -//---------------------------------------------------------------------------- void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib, cmGeneratorTarget const* target, cmake *cm) { @@ -140,7 +139,6 @@ struct DoAccept<true> } }; -//---------------------------------------------------------------------------- template<typename Tag, typename DataType = std::vector<cmSourceFile const*> > struct TagVisitor { @@ -261,7 +259,6 @@ void CreatePropertyGeneratorExpressions( } } -//---------------------------------------------------------------------------- cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg) : Target(t), SourceFileFlagsConstructed(false), @@ -328,19 +325,16 @@ cmLocalGenerator* cmGeneratorTarget::GetLocalGenerator() const return this->LocalGenerator; } -//---------------------------------------------------------------------------- cmState::TargetType cmGeneratorTarget::GetType() const { return this->Target->GetType(); } -//---------------------------------------------------------------------------- const std::string& cmGeneratorTarget::GetName() const { return this->Target->GetName(); } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetExportName() const { const char *exportName = this->GetProperty("EXPORT_NAME"); @@ -360,13 +354,11 @@ std::string cmGeneratorTarget::GetExportName() const return this->GetName(); } -//---------------------------------------------------------------------------- const char *cmGeneratorTarget::GetProperty(const std::string& prop) const { return this->Target->GetProperty(prop); } -//---------------------------------------------------------------------------- const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const { switch(this->GetType()) @@ -422,7 +414,6 @@ const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const return ""; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetOutputName(const std::string& config, bool implib) const { @@ -524,7 +515,6 @@ void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs) } } -//---------------------------------------------------------------------------- std::vector<cmSourceFile*> const* cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const { @@ -588,7 +578,6 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg, #define EMPTY #define COMMA , -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetObjectSources(std::vector<cmSourceFile const*> &data, @@ -631,7 +620,6 @@ void cmGeneratorTarget::ComputeObjectMapping() } } -//---------------------------------------------------------------------------- const char* cmGeneratorTarget::GetFeature(const std::string& feature, const std::string& config) const { @@ -652,27 +640,23 @@ const char* cmGeneratorTarget::GetFeature(const std::string& feature, return this->LocalGenerator->GetFeature(feature, config); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::GetFeatureAsBool(const std::string& feature, const std::string& config) const { return cmSystemTools::IsOn(this->GetFeature(feature, config)); } -//---------------------------------------------------------------------------- const std::string& cmGeneratorTarget::GetObjectName(cmSourceFile const* file) { this->ComputeObjectMapping(); return this->Objects[file]; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::AddExplicitObjectName(cmSourceFile const* sf) { this->ExplicitObjectName.insert(sf); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HasExplicitObjectName(cmSourceFile const* file) const { const_cast<cmGeneratorTarget*>(this)->ComputeObjectMapping(); @@ -681,7 +665,6 @@ bool cmGeneratorTarget::HasExplicitObjectName(cmSourceFile const* file) const return it != this->ExplicitObjectName.end(); } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetIDLSources(std::vector<cmSourceFile const*>& data, const std::string& config) const @@ -689,7 +672,6 @@ void cmGeneratorTarget IMPLEMENT_VISIT(IDLSources); } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetHeaderSources(std::vector<cmSourceFile const*>& data, @@ -698,7 +680,6 @@ cmGeneratorTarget IMPLEMENT_VISIT(HeaderSources); } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetExtraSources(std::vector<cmSourceFile const*>& data, const std::string& config) const @@ -706,7 +687,6 @@ void cmGeneratorTarget IMPLEMENT_VISIT(ExtraSources); } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetCustomCommands(std::vector<cmSourceFile const*>& data, @@ -715,7 +695,6 @@ cmGeneratorTarget IMPLEMENT_VISIT(CustomCommands); } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetExternalObjects(std::vector<cmSourceFile const*>& data, @@ -724,7 +703,6 @@ cmGeneratorTarget IMPLEMENT_VISIT(ExternalObjects); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& srcs, const std::string& config) const @@ -734,7 +712,6 @@ cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& srcs, srcs = data.ExpectedResxHeaders; } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetResxSources(std::vector<cmSourceFile const*>& srcs, const std::string& config) const @@ -744,7 +721,6 @@ void cmGeneratorTarget srcs = data.ResxSources; } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetAppManifest(std::vector<cmSourceFile const*>& data, @@ -753,7 +729,6 @@ cmGeneratorTarget IMPLEMENT_VISIT(AppManifest); } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetManifests(std::vector<cmSourceFile const*>& data, @@ -762,7 +737,6 @@ cmGeneratorTarget IMPLEMENT_VISIT(Manifests); } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetCertificates(std::vector<cmSourceFile const*>& data, @@ -771,7 +745,6 @@ cmGeneratorTarget IMPLEMENT_VISIT(Certificates); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetExpectedXamlHeaders(std::set<std::string>& headers, const std::string& config) const @@ -781,7 +754,6 @@ cmGeneratorTarget::GetExpectedXamlHeaders(std::set<std::string>& headers, headers = data.ExpectedXamlHeaders; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs, const std::string& config) const @@ -808,7 +780,6 @@ std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const return this->UtilityItems; } -//---------------------------------------------------------------------------- void cmGeneratorTarget ::GetXamlSources(std::vector<cmSourceFile const*>& srcs, const std::string& config) const @@ -818,7 +789,6 @@ void cmGeneratorTarget srcs = data.XamlSources; } -//---------------------------------------------------------------------------- const char* cmGeneratorTarget::GetLocation(const std::string& config) const { static std::string location; @@ -861,7 +831,6 @@ bool cmGeneratorTarget::IsImportedGloballyVisible() const return this->Target->IsImportedGloballyVisible(); } -//---------------------------------------------------------------------------- const char* cmGeneratorTarget::GetLocationForBuild() const { static std::string location; @@ -896,7 +865,6 @@ const char* cmGeneratorTarget::GetLocationForBuild() const } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir, const std::string& config) const { @@ -958,13 +926,11 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir, return std::binary_search(iter->second.begin(), iter->second.end(), dir); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::GetPropertyAsBool(const std::string& prop) const { return this->Target->GetPropertyAsBool(prop); } -//---------------------------------------------------------------------------- static void AddInterfaceEntries( cmGeneratorTarget const* thisTarget, std::string const& config, std::string const& prop, @@ -991,7 +957,6 @@ static void AddInterfaceEntries( } } -//---------------------------------------------------------------------------- static bool processSources(cmGeneratorTarget const* tgt, const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, std::vector<std::string> &srcs, @@ -1086,7 +1051,6 @@ static bool processSources(cmGeneratorTarget const* tgt, return contextDependent; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files, const std::string& config) const { @@ -1179,7 +1143,6 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files, cmDeleteAll(linkInterfaceSourcesEntries); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files, const std::string& config) const { @@ -1219,7 +1182,6 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files, } } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetCompilePDBName(const std::string& config) const { @@ -1247,7 +1209,6 @@ cmGeneratorTarget::GetCompilePDBName(const std::string& config) const return ""; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetCompilePDBPath(const std::string& config) const { @@ -1264,7 +1225,6 @@ cmGeneratorTarget::GetCompilePDBPath(const std::string& config) const return dir + name; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HasSOName(const std::string& config) const { // soname is supported only for shared libraries and modules, @@ -1274,7 +1234,6 @@ bool cmGeneratorTarget::HasSOName(const std::string& config) const this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config))); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const { @@ -1340,7 +1299,6 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const || this->HaveInstallTreeRPATH(); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const { // Only certain target types have an rpath. @@ -1407,7 +1365,6 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const return false; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName( const std::string& config) const { @@ -1422,7 +1379,6 @@ bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName( return false; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir( const std::string& config) const { @@ -1506,7 +1462,6 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir( return true; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const { // we can't do rpaths when unsupported @@ -1537,7 +1492,6 @@ bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const return false; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetSOName(const std::string& config) const { if(this->IsImported()) @@ -1582,7 +1536,6 @@ std::string cmGeneratorTarget::GetSOName(const std::string& config) const } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetAppBundleDirectory(const std::string& config, bool contentOnly) const @@ -1598,7 +1551,6 @@ cmGeneratorTarget::GetAppBundleDirectory(const std::string& config, return fpath; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsBundleOnApple() const { return this->IsFrameworkOnApple() @@ -1606,7 +1558,6 @@ bool cmGeneratorTarget::IsBundleOnApple() const || this->IsCFBundleOnApple(); } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config, bool contentOnly) const { @@ -1635,7 +1586,6 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config, return fpath; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetFrameworkDirectory(const std::string& config, bool rootDir) const @@ -1651,7 +1601,6 @@ cmGeneratorTarget::GetFrameworkDirectory(const std::string& config, return fpath; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetFullName(const std::string& config, bool implib) const { @@ -1665,7 +1614,6 @@ cmGeneratorTarget::GetFullName(const std::string& config, bool implib) const } } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetInstallNameDirForBuildTree( const std::string& config) const @@ -1700,7 +1648,6 @@ cmGeneratorTarget::GetInstallNameDirForBuildTree( } } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetInstallNameDirForInstallTree() const { if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) @@ -1753,7 +1700,6 @@ cmGeneratorTarget::GetUtilityBacktrace(const std::string& u) const return this->Target->GetUtilityBacktrace(u); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const { return @@ -1763,7 +1709,6 @@ bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const this->GetType() == cmState::EXECUTABLE; } -//---------------------------------------------------------------------------- const char* cmGeneratorTarget::GetExportMacro() const { // Define the symbol for targets that export symbols. @@ -1789,7 +1734,6 @@ const char* cmGeneratorTarget::GetExportMacro() const } } -//---------------------------------------------------------------------------- class cmTargetCollectLinkLanguages { public: @@ -1869,7 +1813,6 @@ private: std::set<cmGeneratorTarget const*> Visited; }; -//---------------------------------------------------------------------------- cmGeneratorTarget::LinkClosure const* cmGeneratorTarget::GetLinkClosure(const std::string& config) const { @@ -1886,7 +1829,6 @@ cmGeneratorTarget::GetLinkClosure(const std::string& config) const return &i->second; } -//---------------------------------------------------------------------------- class cmTargetSelectLinker { int Preference; @@ -1938,7 +1880,6 @@ public: } }; -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkClosure(const std::string& config, LinkClosure& lc) const { @@ -2004,7 +1945,6 @@ void cmGeneratorTarget::ComputeLinkClosure(const std::string& config, } } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetFullNameComponents(std::string& prefix, std::string& base, std::string& suffix, @@ -2014,7 +1954,6 @@ void cmGeneratorTarget::GetFullNameComponents(std::string& prefix, this->GetFullNameInternal(config, implib, prefix, base, suffix); } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::BuildMacContentDirectory(const std::string& base, const std::string& config, @@ -2036,7 +1975,6 @@ cmGeneratorTarget::BuildMacContentDirectory(const std::string& base, return fpath; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetMacContentDirectory(const std::string& config, bool implib) const @@ -2056,7 +1994,6 @@ cmGeneratorTarget::GetMacContentDirectory(const std::string& config, } -//---------------------------------------------------------------------------- cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo( const std::string& config) const { @@ -2094,7 +2031,6 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo( return &i->second; } -//---------------------------------------------------------------------------- cmSourceFile const* cmGeneratorTarget::GetModuleDefinitionFile(const std::string& config) const { @@ -2114,7 +2050,6 @@ bool cmGeneratorTarget::IsDLLPlatform() const return this->DLLPlatform; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs, const std::string &config) const @@ -2154,7 +2089,6 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs, } } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result, const std::string& config) const { @@ -2179,7 +2113,6 @@ void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result, result); } -//---------------------------------------------------------------------------- void processILibs(const std::string& config, cmGeneratorTarget const* headTarget, cmLinkItem const& item, @@ -2203,7 +2136,6 @@ void processILibs(const std::string& config, } } -//---------------------------------------------------------------------------- const std::vector<const cmGeneratorTarget*>& cmGeneratorTarget::GetLinkImplementationClosure( const std::string& config) const @@ -2230,7 +2162,6 @@ cmGeneratorTarget::GetLinkImplementationClosure( return tgts; } -//---------------------------------------------------------------------------- class cmTargetTraceDependencies { public: @@ -2260,7 +2191,6 @@ private: std::set<std::string>& emitted); }; -//---------------------------------------------------------------------------- cmTargetTraceDependencies ::cmTargetTraceDependencies(cmGeneratorTarget* target): GeneratorTarget(target) @@ -2319,7 +2249,6 @@ cmTargetTraceDependencies this->GeneratorTarget->GetPostBuildCommands()); } -//---------------------------------------------------------------------------- void cmTargetTraceDependencies::Trace() { // Process one dependency at a time until the queue is empty. @@ -2363,7 +2292,6 @@ void cmTargetTraceDependencies::Trace() this->GeneratorTarget->AddTracedSources(this->NewSources); } -//---------------------------------------------------------------------------- void cmTargetTraceDependencies::QueueSource(cmSourceFile* sf) { if(this->SourcesQueued.insert(sf).second) @@ -2375,7 +2303,6 @@ void cmTargetTraceDependencies::QueueSource(cmSourceFile* sf) } } -//---------------------------------------------------------------------------- void cmTargetTraceDependencies::FollowName(std::string const& name) { NameMapType::iterator i = this->NameMap.find(name); @@ -2397,7 +2324,6 @@ void cmTargetTraceDependencies::FollowName(std::string const& name) } } -//---------------------------------------------------------------------------- void cmTargetTraceDependencies::FollowNames(std::vector<std::string> const& names) { @@ -2408,7 +2334,6 @@ cmTargetTraceDependencies::FollowNames(std::vector<std::string> const& names) } } -//---------------------------------------------------------------------------- bool cmTargetTraceDependencies::IsUtility(std::string const& dep) { // Dependencies on targets (utilities) are supposed to be named by @@ -2463,7 +2388,6 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep) return false; } -//---------------------------------------------------------------------------- void cmTargetTraceDependencies ::CheckCustomCommand(cmCustomCommand const& cc) @@ -2526,7 +2450,6 @@ cmTargetTraceDependencies } } -//---------------------------------------------------------------------------- void cmTargetTraceDependencies::FollowCommandDepends(cmCustomCommand const& cc, const std::string& config, std::set<std::string>& emitted) @@ -2552,7 +2475,6 @@ void cmTargetTraceDependencies::FollowCommandDepends(cmCustomCommand const& cc, } } -//---------------------------------------------------------------------------- void cmTargetTraceDependencies ::CheckCustomCommands(const std::vector<cmCustomCommand>& commands) @@ -2564,7 +2486,6 @@ cmTargetTraceDependencies } } -//---------------------------------------------------------------------------- void cmGeneratorTarget::TraceDependencies() { // CMake-generated targets have no dependencies to trace. Normally tracing @@ -2591,7 +2512,6 @@ cmGeneratorTarget::GetCompilePDBDirectory(const std::string& config) const return ""; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetAppleArchs(const std::string& config, std::vector<std::string>& archVec) const { @@ -2612,7 +2532,6 @@ void cmGeneratorTarget::GetAppleArchs(const std::string& config, } } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang, std::string const& config) const @@ -2644,7 +2563,6 @@ cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang, } return ""; } -//---------------------------------------------------------------------------- static void processIncludeDirectories(cmGeneratorTarget const* tgt, const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, std::vector<std::string> &includes, @@ -2777,7 +2695,6 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt, } } -//---------------------------------------------------------------------------- std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories(const std::string& config, const std::string& lang) const @@ -2863,7 +2780,6 @@ cmGeneratorTarget::GetIncludeDirectories(const std::string& config, return includes; } -//---------------------------------------------------------------------------- static void processCompileOptionsInternal(cmGeneratorTarget const* tgt, const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, std::vector<std::string> &options, @@ -2910,7 +2826,6 @@ static void processCompileOptionsInternal(cmGeneratorTarget const* tgt, } } -//---------------------------------------------------------------------------- static void processCompileOptions(cmGeneratorTarget const* tgt, const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, std::vector<std::string> &options, @@ -2924,7 +2839,6 @@ static void processCompileOptions(cmGeneratorTarget const* tgt, language); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetCompileOptions(std::vector<std::string> &result, const std::string& config, const std::string& language) const @@ -2981,7 +2895,6 @@ void cmGeneratorTarget::GetCompileOptions(std::vector<std::string> &result, cmDeleteAll(linkInterfaceCompileOptionsEntries); } -//---------------------------------------------------------------------------- static void processCompileFeatures(cmGeneratorTarget const* tgt, const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, std::vector<std::string> &options, @@ -2994,7 +2907,6 @@ static void processCompileFeatures(cmGeneratorTarget const* tgt, std::string()); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetCompileFeatures(std::vector<std::string> &result, const std::string& config) const { @@ -3048,7 +2960,6 @@ void cmGeneratorTarget::GetCompileFeatures(std::vector<std::string> &result, cmDeleteAll(linkInterfaceCompileFeaturesEntries); } -//---------------------------------------------------------------------------- static void processCompileDefinitions(cmGeneratorTarget const* tgt, const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, std::vector<std::string> &options, @@ -3062,7 +2973,6 @@ static void processCompileDefinitions(cmGeneratorTarget const* tgt, "definitions", language); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list, const std::string& config, const std::string& language) const @@ -3150,7 +3060,6 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list, cmDeleteAll(linkInterfaceCompileDefinitionsEntries); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeTargetManifest( const std::string& config) const { @@ -3224,7 +3133,6 @@ void cmGeneratorTarget::ComputeTargetManifest( } } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetFullPath(const std::string& config, bool implib, bool realname) const { @@ -3266,7 +3174,6 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config, return fpath; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::NormalGetRealName(const std::string& config) const { @@ -3304,7 +3211,6 @@ cmGeneratorTarget::NormalGetRealName(const std::string& config) const } } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetLibraryNames(std::string& name, std::string& soName, std::string& realName, @@ -3395,7 +3301,6 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name, pdbName = this->GetPDBName(config); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetExecutableNames(std::string& name, std::string& realName, std::string& impName, @@ -3457,7 +3362,6 @@ void cmGeneratorTarget::GetExecutableNames(std::string& name, pdbName = this->GetPDBName(config); } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetFullNameInternal(const std::string& config, bool implib) const { @@ -3468,7 +3372,6 @@ std::string cmGeneratorTarget::GetFullNameInternal(const std::string& config, return prefix+base+suffix; } -//---------------------------------------------------------------------------- const char* cmGeneratorTarget::ImportedGetLocation(const std::string& config) const { @@ -3478,7 +3381,6 @@ cmGeneratorTarget::ImportedGetLocation(const std::string& config) const return location.c_str(); } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetFullNameImported(const std::string& config, bool implib) const { @@ -3486,7 +3388,6 @@ std::string cmGeneratorTarget::GetFullNameImported(const std::string& config, this->Target->ImportedGetFullPath(config, implib)); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetFullNameInternal(const std::string& config, bool implib, std::string& outPrefix, @@ -3618,14 +3519,12 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config, } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetLinkerLanguage(const std::string& config) const { return this->GetLinkClosure(config)->LinkerLanguage; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetPDBName(const std::string& config) const { std::string prefix; @@ -3669,7 +3568,6 @@ bool cmGeneratorTarget::StrictTargetComparison::operator()( return nameResult < 0; } -//---------------------------------------------------------------------------- struct cmGeneratorTarget::SourceFileFlags cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const { @@ -3701,7 +3599,6 @@ cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const return flags; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ConstructSourceFileFlags() const { if(this->SourceFileFlagsConstructed) @@ -3767,7 +3664,6 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const } } -//---------------------------------------------------------------------------- const cmGeneratorTarget::CompatibleInterfacesBase& cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const { @@ -3800,7 +3696,6 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const return compat; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty( const std::string &p, const std::string& config) const { @@ -3812,7 +3707,6 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty( return this->GetCompatibleInterfaces(config).PropsBool.count(p) > 0; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty( const std::string &p, const std::string& config) const { @@ -3824,7 +3718,6 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty( return this->GetCompatibleInterfaces(config).PropsString.count(p) > 0; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty( const std::string &p, const std::string& config) const { @@ -3836,7 +3729,6 @@ bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty( return this->GetCompatibleInterfaces(config).PropsNumberMin.count(p) > 0; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMaxProperty( const std::string &p, const std::string& config) const { @@ -3895,7 +3787,6 @@ const char * getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt, return 0; } -//---------------------------------------------------------------------------- template<typename PropertyType> void checkPropertyConsistency(cmGeneratorTarget const* depender, cmGeneratorTarget const* dependee, @@ -3989,7 +3880,6 @@ static std::string intersect(const std::set<std::string> &s1, return intersect(s2, s3, s4); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::CheckPropertyCompatibility( cmComputeLinkInformation *info, const std::string& config) const { @@ -4090,7 +3980,6 @@ void cmGeneratorTarget::CheckPropertyCompatibility( } } -//---------------------------------------------------------------------------- std::string compatibilityType(CompatibleType t) { switch(t) @@ -4108,7 +3997,6 @@ std::string compatibilityType(CompatibleType t) return ""; } -//---------------------------------------------------------------------------- std::string compatibilityAgree(CompatibleType t, bool dominant) { switch(t) @@ -4124,12 +4012,10 @@ std::string compatibilityAgree(CompatibleType t, bool dominant) return ""; } -//---------------------------------------------------------------------------- template<typename PropertyType> PropertyType getTypedProperty(cmGeneratorTarget const* tgt, const std::string& prop); -//---------------------------------------------------------------------------- template<> bool getTypedProperty<bool>(cmGeneratorTarget const* tgt, const std::string& prop) @@ -4137,7 +4023,6 @@ bool getTypedProperty<bool>(cmGeneratorTarget const* tgt, return tgt->GetPropertyAsBool(prop); } -//---------------------------------------------------------------------------- template<> const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt, const std::string& prop) @@ -4171,13 +4056,11 @@ const char* impliedValue<const char*>(const char*) return ""; } -//---------------------------------------------------------------------------- template<typename PropertyType> std::pair<bool, PropertyType> consistentProperty(PropertyType lhs, PropertyType rhs, CompatibleType t); -//---------------------------------------------------------------------------- template<> std::pair<bool, bool> consistentProperty(bool lhs, bool rhs, CompatibleType) @@ -4185,7 +4068,6 @@ std::pair<bool, bool> consistentProperty(bool lhs, bool rhs, return std::make_pair(lhs == rhs, lhs); } -//---------------------------------------------------------------------------- std::pair<bool, const char*> consistentStringProperty(const char *lhs, const char *rhs) { @@ -4193,7 +4075,6 @@ std::pair<bool, const char*> consistentStringProperty(const char *lhs, return std::make_pair(b, b ? lhs : 0); } -//---------------------------------------------------------------------------- std::pair<bool, const char*> consistentNumberProperty(const char *lhs, const char *rhs, CompatibleType t) @@ -4224,7 +4105,6 @@ std::pair<bool, const char*> consistentNumberProperty(const char *lhs, } } -//---------------------------------------------------------------------------- template<> std::pair<bool, const char*> consistentProperty(const char *lhs, const char *rhs, @@ -4260,7 +4140,6 @@ std::pair<bool, const char*> consistentProperty(const char *lhs, return std::pair<bool, const char*>(false, null_ptr); } -//---------------------------------------------------------------------------- template<typename PropertyType> PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt, const std::string &p, @@ -4450,7 +4329,6 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt, return propContent; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::GetLinkInterfaceDependentBoolProperty( const std::string &p, const std::string& config) const { @@ -4459,7 +4337,6 @@ bool cmGeneratorTarget::GetLinkInterfaceDependentBoolProperty( BoolType, 0); } -//---------------------------------------------------------------------------- const char* cmGeneratorTarget::GetLinkInterfaceDependentStringProperty( const std::string &p, const std::string& config) const @@ -4471,7 +4348,6 @@ const char* cmGeneratorTarget::GetLinkInterfaceDependentStringProperty( StringType, 0); } -//---------------------------------------------------------------------------- const char * cmGeneratorTarget::GetLinkInterfaceDependentNumberMinProperty( const std::string &p, const std::string& config) const @@ -4483,7 +4359,6 @@ const char * cmGeneratorTarget::GetLinkInterfaceDependentNumberMinProperty( NumberMinType, 0); } -//---------------------------------------------------------------------------- const char * cmGeneratorTarget::GetLinkInterfaceDependentNumberMaxProperty( const std::string &p, const std::string& config) const @@ -4495,7 +4370,6 @@ const char * cmGeneratorTarget::GetLinkInterfaceDependentNumberMaxProperty( NumberMaxType, 0); } -//---------------------------------------------------------------------------- cmComputeLinkInformation* cmGeneratorTarget::GetLinkInformation(const std::string& config) const { @@ -4526,14 +4400,12 @@ cmGeneratorTarget::GetLinkInformation(const std::string& config) const return i->second; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetTargetVersion(int& major, int& minor) const { int patch; this->GetTargetVersion(false, major, minor, patch); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetTargetVersion(bool soversion, int& major, int& minor, int& patch) const { @@ -4564,7 +4436,6 @@ void cmGeneratorTarget::GetTargetVersion(bool soversion, } } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetFrameworkVersion() const { assert(this->GetType() != cmState::INTERFACE_LIBRARY); @@ -4583,7 +4454,6 @@ std::string cmGeneratorTarget::GetFrameworkVersion() const } } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeVersionedName(std::string& vName, std::string const& prefix, std::string const& base, @@ -4613,7 +4483,6 @@ std::vector<std::string> cmGeneratorTarget::GetPropertyKeys() const return props; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ReportPropertyOrigin(const std::string &p, const std::string &result, @@ -4653,7 +4522,6 @@ cmGeneratorTarget::ReportPropertyOrigin(const std::string &p, this->LocalGenerator->GetCMakeInstance()->IssueMessage(cmake::LOG, areport); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names, std::vector<cmLinkItem>& items) const { @@ -4669,7 +4537,6 @@ void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names, } } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ExpandLinkItems(std::string const& prop, std::string const& value, std::string const& config, @@ -4698,7 +4565,6 @@ void cmGeneratorTarget::ExpandLinkItems(std::string const& prop, hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition(); } -//---------------------------------------------------------------------------- cmLinkInterface const* cmGeneratorTarget::GetLinkInterface(const std::string& config, cmGeneratorTarget const* head) const @@ -4747,7 +4613,6 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config, return iface.Exists? &iface : 0; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkInterface(const std::string& config, cmOptionalLinkInterface &iface, cmGeneratorTarget const* headTarget) const @@ -4845,7 +4710,6 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config, } } -//---------------------------------------------------------------------------- const cmLinkInterfaceLibraries * cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config, cmGeneratorTarget const* head, @@ -4891,7 +4755,6 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config, return iface.Exists? &iface : 0; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetDirectory(const std::string& config, bool implib) const { @@ -4910,7 +4773,6 @@ std::string cmGeneratorTarget::GetDirectory(const std::string& config, return ""; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config, bool implib) const { @@ -4918,7 +4780,6 @@ bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config, return this->ComputeOutputDir(config, implib, dir); } -//---------------------------------------------------------------------------- cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo( const std::string& config) const { @@ -4978,7 +4839,6 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo( return &i->second; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::ComputeOutputDir(const std::string& config, bool implib, std::string& out) const { @@ -5072,7 +4932,6 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config, return usesDefaultOutputDir; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind, const std::string& config, std::string& out) const @@ -5133,7 +4992,6 @@ bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind, return true; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HaveInstallTreeRPATH() const { const char* install_rpath = this->GetProperty("INSTALL_RPATH"); @@ -5141,7 +4999,6 @@ bool cmGeneratorTarget::HaveInstallTreeRPATH() const !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH"); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkInterfaceLibraries( const std::string& config, @@ -5296,7 +5153,6 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( } } -//---------------------------------------------------------------------------- const cmLinkInterface * cmGeneratorTarget::GetImportLinkInterface(const std::string& config, cmGeneratorTarget const* headTarget, @@ -5340,7 +5196,6 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config, return &iface; } -//---------------------------------------------------------------------------- cmGeneratorTarget::ImportInfo const* cmGeneratorTarget::GetImportInfo(const std::string& config) const { @@ -5387,7 +5242,6 @@ cmGeneratorTarget::GetImportInfo(const std::string& config) const return &i->second; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config, ImportInfo& info) const { @@ -5572,7 +5426,6 @@ cmGeneratorTarget::GetHeadToLinkInterfaceUsageRequirementsMap( return this->LinkInterfaceUsageRequirementsOnlyMap[CONFIG]; } -//---------------------------------------------------------------------------- const cmLinkImplementation * cmGeneratorTarget::GetLinkImplementation(const std::string& config) const { @@ -5597,7 +5450,6 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const return &impl; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::GetConfigCommonSourceFiles( std::vector<cmSourceFile*>& files) const { @@ -5656,7 +5508,6 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles( return true; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetObjectLibrariesCMP0026( std::vector<cmGeneratorTarget*>& objlibs) const { @@ -5696,7 +5547,6 @@ void cmGeneratorTarget::GetObjectLibrariesCMP0026( } } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const { // Strip whitespace off the library names because we used to do this @@ -5755,7 +5605,6 @@ std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const return lib; } -//---------------------------------------------------------------------------- void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages, const std::string& config) const { @@ -5805,7 +5654,6 @@ void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages, } } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkImplementationLanguages( const std::string& config, cmOptionalLinkImplementation& impl) const @@ -5819,7 +5667,6 @@ void cmGeneratorTarget::ComputeLinkImplementationLanguages( languages.begin(), languages.end()); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HaveBuildTreeRPATH(const std::string& config) const { if (this->GetPropertyAsBool("SKIP_BUILD_RPATH")) @@ -5834,7 +5681,6 @@ bool cmGeneratorTarget::HaveBuildTreeRPATH(const std::string& config) const return false; } -//---------------------------------------------------------------------------- cmLinkImplementationLibraries const* cmGeneratorTarget::GetLinkImplementationLibraries( const std::string& config) const @@ -5842,7 +5688,6 @@ cmGeneratorTarget::GetLinkImplementationLibraries( return this->GetLinkImplementationLibrariesInternal(config, this); } -//---------------------------------------------------------------------------- cmLinkImplementationLibraries const* cmGeneratorTarget::GetLinkImplementationLibrariesInternal( const std::string& config, cmGeneratorTarget const* head) const @@ -5874,7 +5719,6 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal( return &impl; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const { @@ -5882,7 +5726,6 @@ cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const != this->LinkImplicitNullProperties.end(); } -//---------------------------------------------------------------------------- void cmGeneratorTarget::ComputeLinkImplementationLibraries( const std::string& config, cmOptionalLinkImplementation& impl, @@ -5999,7 +5842,6 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries( } } -//---------------------------------------------------------------------------- cmGeneratorTarget* cmGeneratorTarget::FindTargetToLink(std::string const& name) const { @@ -6032,7 +5874,6 @@ cmGeneratorTarget::FindTargetToLink(std::string const& name) const return tgt; } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetPDBDirectory(const std::string& config) const { @@ -6044,14 +5885,12 @@ cmGeneratorTarget::GetPDBDirectory(const std::string& config) const return ""; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HasImplibGNUtoMS() const { return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS"); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName, std::string& out, const char* newExt) const { @@ -6065,14 +5904,12 @@ bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName, return false; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsExecutableWithExports() const { return (this->GetType() == cmState::EXECUTABLE && this->GetPropertyAsBool("ENABLE_EXPORTS")); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::HasImportLibrary() const { return (this->IsDLLPlatform() && @@ -6080,7 +5917,6 @@ bool cmGeneratorTarget::HasImportLibrary() const this->IsExecutableWithExports())); } -//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetSupportDirectory() const { std::string dir = this->LocalGenerator->GetCurrentBinaryDirectory(); @@ -6095,7 +5931,6 @@ std::string cmGeneratorTarget::GetSupportDirectory() const return dir; } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsLinkable() const { return (this->GetType() == cmState::STATIC_LIBRARY || @@ -6106,7 +5941,6 @@ bool cmGeneratorTarget::IsLinkable() const this->IsExecutableWithExports()); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsFrameworkOnApple() const { return (this->GetType() == cmState::SHARED_LIBRARY && @@ -6114,7 +5948,6 @@ bool cmGeneratorTarget::IsFrameworkOnApple() const this->GetPropertyAsBool("FRAMEWORK")); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsAppBundleOnApple() const { return (this->GetType() == cmState::EXECUTABLE && @@ -6122,14 +5955,12 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const this->GetPropertyAsBool("MACOSX_BUNDLE")); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsXCTestOnApple() const { return (this->IsCFBundleOnApple() && this->GetPropertyAsBool("XCTEST")); } -//---------------------------------------------------------------------------- bool cmGeneratorTarget::IsCFBundleOnApple() const { return (this->GetType() == cmState::MODULE_LIBRARY && diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index bbeae4b..6bcc131 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -18,13 +18,11 @@ #include "cmTest.h" #include "cmake.h" -//---------------------------------------------------------------------------- cmGetPropertyCommand::cmGetPropertyCommand() { this->InfoType = OutValue; } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -202,7 +200,6 @@ bool cmGetPropertyCommand return true; } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::StoreResult(const char* value) { if(this->InfoType == OutSet) @@ -223,7 +220,6 @@ bool cmGetPropertyCommand::StoreResult(const char* value) return true; } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleGlobalMode() { if(!this->Name.empty()) @@ -238,7 +234,6 @@ bool cmGetPropertyCommand::HandleGlobalMode() ->GetGlobalProperty(this->PropertyName)); } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleDirectoryMode() { // Default to the current directory. @@ -293,7 +288,6 @@ bool cmGetPropertyCommand::HandleDirectoryMode() return this->StoreResult(mf->GetProperty(this->PropertyName)); } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleTargetMode() { if(this->Name.empty()) @@ -329,7 +323,6 @@ bool cmGetPropertyCommand::HandleTargetMode() } } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleSourceMode() { if(this->Name.empty()) @@ -355,7 +348,6 @@ bool cmGetPropertyCommand::HandleSourceMode() } } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleTestMode() { if(this->Name.empty()) @@ -377,7 +369,6 @@ bool cmGetPropertyCommand::HandleTestMode() return false; } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleVariableMode() { if(!this->Name.empty()) @@ -390,7 +381,6 @@ bool cmGetPropertyCommand::HandleVariableMode() (this->Makefile->GetDefinition(this->PropertyName)); } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleCacheMode() { if(this->Name.empty()) @@ -409,7 +399,6 @@ bool cmGetPropertyCommand::HandleCacheMode() return true; } -//---------------------------------------------------------------------------- bool cmGetPropertyCommand::HandleInstallMode() { if(this->Name.empty()) diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index 374cc88..48a04c3 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.cxx +++ b/Source/cmGlobalBorlandMakefileGenerator.cxx @@ -56,7 +56,6 @@ cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator( } -//---------------------------------------------------------------------------- void cmGlobalBorlandMakefileGenerator ::GetDocumentation(cmDocumentationEntry& entry) { diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index bd809e1..2b06d7d 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -857,7 +857,6 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages, } } -//---------------------------------------------------------------------------- void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os, std::string const& lang, const char* envVar) const @@ -879,7 +878,6 @@ void cmGlobalGenerator::PrintCompilerAdvice(std::ostream& os, ; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf, std::string const& lang) const { @@ -965,7 +963,6 @@ void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf, } } -//---------------------------------------------------------------------------- std::string cmGlobalGenerator::GetLanguageOutputExtension(cmSourceFile const& source) const { @@ -1283,7 +1280,6 @@ cmGlobalGenerator::GetExportedTargetsFile(const std::string &filename) const return it == this->BuildExportSets.end() ? 0 : it->second; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::AddCMP0042WarnTarget(const std::string& target) { this->CMP0042WarnTargets.insert(target); @@ -1483,7 +1479,6 @@ void cmGlobalGenerator::Generate() this->CMakeInstance->UpdateProgress("Generating done", -1); } -//---------------------------------------------------------------------------- bool cmGlobalGenerator::ComputeTargetDepends() { cmComputeTargetDepends ctd(this); @@ -1500,7 +1495,6 @@ bool cmGlobalGenerator::ComputeTargetDepends() return true; } -//---------------------------------------------------------------------------- std::vector<const cmGeneratorTarget*> cmGlobalGenerator::CreateQtAutoGeneratorsTargets() { @@ -1564,7 +1558,6 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets() return autogenTargets; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::FinalizeTargetCompileInfo() { // Construct per-target generator information. @@ -1623,7 +1616,6 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo() } } -//---------------------------------------------------------------------------- void cmGlobalGenerator::CreateGeneratorTargets( TargetTypes targetTypes, cmMakefile *mf, @@ -1651,7 +1643,6 @@ void cmGlobalGenerator::CreateGeneratorTargets( } } -//---------------------------------------------------------------------------- void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes) { std::map<cmTarget*, cmGeneratorTarget*> importedMap; @@ -1678,7 +1669,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes) } -//---------------------------------------------------------------------------- void cmGlobalGenerator::ClearGeneratorMembers() { cmDeleteAll(this->BuildExportSets); @@ -1700,7 +1690,6 @@ void cmGlobalGenerator::ClearGeneratorMembers() this->BinaryDirectories.clear(); } -//---------------------------------------------------------------------------- void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const { } @@ -1959,7 +1948,6 @@ int cmGlobalGenerator::Build( return retVal; } -//---------------------------------------------------------------------------- std::string cmGlobalGenerator::GenerateCMakeBuildCommand( const std::string& target, const std::string& config, const std::string& native, @@ -1999,7 +1987,6 @@ std::string cmGlobalGenerator::GenerateCMakeBuildCommand( return makeCommand; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::AddMakefile(cmMakefile *mf) { this->Makefiles.push_back(mf); @@ -2077,7 +2064,6 @@ void cmGlobalGenerator::EnableLanguagesFromGenerator(cmGlobalGenerator *gen, this->OutputExtensions = gen->OutputExtensions; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::SetConfiguredFilesPath(cmGlobalGenerator* gen) { if(!gen->ConfiguredFilesPath.empty()) @@ -2209,14 +2195,12 @@ cmGlobalGenerator::FindLocalGenerator(const std::string& start_dir) const return 0; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::AddAlias(const std::string& name, std::string const& tgtName) { this->AliasTargets[name] = tgtName; } -//---------------------------------------------------------------------------- bool cmGlobalGenerator::IsAlias(const std::string& name) const { return this->AliasTargets.find(name) != this->AliasTargets.end(); @@ -2260,7 +2244,6 @@ cmGlobalGenerator::FindGeneratorTargetImpl(std::string const& name) const return 0; } -//---------------------------------------------------------------------------- cmTarget* cmGlobalGenerator::FindTarget(const std::string& name, bool excludeAliases) const @@ -2289,7 +2272,6 @@ cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const return this->FindGeneratorTargetImpl(name); } -//---------------------------------------------------------------------------- bool cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const { @@ -2309,7 +2291,6 @@ cmGlobalGenerator::NameResolvesToFramework(const std::string& libname) const return false; } -//---------------------------------------------------------------------------- inline std::string removeQuotes(const std::string& s) { if(s[0] == '\"' && s[s.size()-1] == '\"') @@ -2587,7 +2568,6 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets) } } -//---------------------------------------------------------------------------- const char* cmGlobalGenerator::GetPredefinedTargetsFolder() { const char* prop = this->GetCMakeInstance()->GetState() @@ -2601,7 +2581,6 @@ const char* cmGlobalGenerator::GetPredefinedTargetsFolder() return "CMakePredefinedTargets"; } -//---------------------------------------------------------------------------- bool cmGlobalGenerator::UseFolderProperty() { const char* prop = this->GetCMakeInstance()->GetState() @@ -2620,7 +2599,6 @@ bool cmGlobalGenerator::UseFolderProperty() return false; } -//---------------------------------------------------------------------------- cmTarget cmGlobalGenerator::CreateGlobalTarget( const std::string& name, const char* message, const cmCustomCommandLines* commandLines, @@ -2658,7 +2636,6 @@ cmTarget cmGlobalGenerator::CreateGlobalTarget( return target; } -//---------------------------------------------------------------------------- std::string cmGlobalGenerator::GenerateRuleFile(std::string const& output) const { @@ -2673,7 +2650,6 @@ cmGlobalGenerator::GenerateRuleFile(std::string const& output) const return ruleFile; } -//---------------------------------------------------------------------------- std::string cmGlobalGenerator::GetSharedLibFlagsForLanguage( std::string const& l) const { @@ -2686,7 +2662,6 @@ std::string cmGlobalGenerator::GetSharedLibFlagsForLanguage( return ""; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::AppendDirectoryForConfig(const std::string&, const std::string&, const std::string&, @@ -2697,7 +2672,6 @@ void cmGlobalGenerator::AppendDirectoryForConfig(const std::string&, // configuration. } -//---------------------------------------------------------------------------- cmGlobalGenerator::TargetDependSet const& cmGlobalGenerator::GetTargetDirectDepends(cmGeneratorTarget const* target) { @@ -2761,7 +2735,6 @@ cmGlobalGenerator std::back_inserter(filenames)); } -//---------------------------------------------------------------------------- void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets, TargetDependSet& originalTargets, cmLocalGenerator* root, @@ -2796,14 +2769,12 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets, } } -//---------------------------------------------------------------------------- bool cmGlobalGenerator::IsRootOnlyTarget(cmGeneratorTarget* target) const { return (target->GetType() == cmState::GLOBAL_TARGET || target->GetName() == this->GetAllTargetName()); } -//---------------------------------------------------------------------------- void cmGlobalGenerator::AddTargetDepends(cmGeneratorTarget const* target, TargetDependSet& projectTargets) { @@ -2821,7 +2792,6 @@ void cmGlobalGenerator::AddTargetDepends(cmGeneratorTarget const* target, } -//---------------------------------------------------------------------------- void cmGlobalGenerator::AddToManifest(std::string const& f) { // Add to the content listing for the file's directory. @@ -2832,7 +2802,6 @@ void cmGlobalGenerator::AddToManifest(std::string const& f) dc.All.insert(file); } -//---------------------------------------------------------------------------- std::set<std::string> const& cmGlobalGenerator::GetDirectoryContent(std::string const& dir, bool needDisk) { @@ -2865,7 +2834,6 @@ cmGlobalGenerator::GetDirectoryContent(std::string const& dir, bool needDisk) return dc.All; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::AddRuleHash(const std::vector<std::string>& outputs, std::string const& content) @@ -2903,7 +2871,6 @@ cmGlobalGenerator::AddRuleHash(const std::vector<std::string>& outputs, #endif } -//---------------------------------------------------------------------------- void cmGlobalGenerator::CheckRuleHashes() { #if defined(CMAKE_BUILD_WITH_CMAKE) @@ -2916,7 +2883,6 @@ void cmGlobalGenerator::CheckRuleHashes() #endif } -//---------------------------------------------------------------------------- void cmGlobalGenerator::CheckRuleHashes(std::string const& pfile, std::string const& home) { @@ -2979,7 +2945,6 @@ void cmGlobalGenerator::CheckRuleHashes(std::string const& pfile, } } -//---------------------------------------------------------------------------- void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile) { // Now generate a new persistence file with the current hashes. @@ -3000,7 +2965,6 @@ void cmGlobalGenerator::WriteRuleHashes(std::string const& pfile) } } -//---------------------------------------------------------------------------- void cmGlobalGenerator::WriteSummary() { // Record all target directories in a central location. @@ -3026,7 +2990,6 @@ void cmGlobalGenerator::WriteSummary() } } -//---------------------------------------------------------------------------- void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target) { // Place the labels file in a per-target support directory. @@ -3115,7 +3078,6 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target) } } -//---------------------------------------------------------------------------- // static std::string cmGlobalGenerator::EscapeJSON(const std::string& s) { std::string result; @@ -3128,20 +3090,17 @@ std::string cmGlobalGenerator::EscapeJSON(const std::string& s) { return result; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::SetFilenameTargetDepends(cmSourceFile* sf, std::set<cmGeneratorTarget const*> tgts) { this->FilenameTargetDepends[sf] = tgts; } -//---------------------------------------------------------------------------- std::set<cmGeneratorTarget const*> const& cmGlobalGenerator::GetFilenameTargetDepends(cmSourceFile* sf) const { return this->FilenameTargetDepends[sf]; } -//---------------------------------------------------------------------------- void cmGlobalGenerator::CreateEvaluationSourceFiles( std::string const& config) const { @@ -3152,7 +3111,6 @@ void cmGlobalGenerator::CreateEvaluationSourceFiles( } } -//---------------------------------------------------------------------------- void cmGlobalGenerator::ProcessEvaluationFiles() { std::vector<std::string> generatedFiles; @@ -3163,14 +3121,12 @@ void cmGlobalGenerator::ProcessEvaluationFiles() } } -//---------------------------------------------------------------------------- std::string cmGlobalGenerator::ExpandCFGIntDir(const std::string& str, const std::string& /*config*/) const { return str; } -//---------------------------------------------------------------------------- bool cmGlobalGenerator::GenerateCPackPropertiesFile() { cmake::InstalledFilesMap const& installedFiles = diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index aeb7dd5..6ae82d8 100644 --- a/Source/cmGlobalJOMMakefileGenerator.cxx +++ b/Source/cmGlobalJOMMakefileGenerator.cxx @@ -40,7 +40,6 @@ void cmGlobalJOMMakefileGenerator this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); } -//---------------------------------------------------------------------------- void cmGlobalJOMMakefileGenerator ::GetDocumentation(cmDocumentationEntry& entry) { @@ -48,7 +47,6 @@ void cmGlobalJOMMakefileGenerator entry.Brief = "Generates JOM makefiles."; } -//---------------------------------------------------------------------------- void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice(std::ostream& os, std::string const& lang, const char* envVar) const diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx index e2f1fc5..f2de750 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -25,7 +25,6 @@ #include <cmsys/FStream.hxx> #include <cmsys/SystemTools.hxx> -//---------------------------------------------------------------------------- void cmGlobalKdevelopGenerator ::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const { diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index a2b0bd1..88eb4f3 100644 --- a/Source/cmGlobalMSYSMakefileGenerator.cxx +++ b/Source/cmGlobalMSYSMakefileGenerator.cxx @@ -95,7 +95,6 @@ void cmGlobalMSYSMakefileGenerator } } -//---------------------------------------------------------------------------- void cmGlobalMSYSMakefileGenerator ::GetDocumentation(cmDocumentationEntry& entry) { diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx index c965f57..fab9eda 100644 --- a/Source/cmGlobalMinGWMakefileGenerator.cxx +++ b/Source/cmGlobalMinGWMakefileGenerator.cxx @@ -60,7 +60,6 @@ void cmGlobalMinGWMakefileGenerator this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); } -//---------------------------------------------------------------------------- void cmGlobalMinGWMakefileGenerator ::GetDocumentation(cmDocumentationEntry& entry) { diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index 6241329..6080f96 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -40,7 +40,6 @@ void cmGlobalNMakeMakefileGenerator this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); } -//---------------------------------------------------------------------------- void cmGlobalNMakeMakefileGenerator ::GetDocumentation(cmDocumentationEntry& entry) { @@ -48,7 +47,6 @@ void cmGlobalNMakeMakefileGenerator entry.Brief = "Generates NMake makefiles."; } -//---------------------------------------------------------------------------- void cmGlobalNMakeMakefileGenerator::PrintCompilerAdvice(std::ostream& os, std::string const& lang, const char* envVar) const diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 953df6b..6f631e5 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -531,7 +531,6 @@ cmGlobalNinjaGenerator::cmGlobalNinjaGenerator(cmake* cm) } -//---------------------------------------------------------------------------- // Virtual public methods. cmLocalGenerator* @@ -685,7 +684,6 @@ void cmGlobalNinjaGenerator } } -//---------------------------------------------------------------------------- // Non-virtual public methods. void cmGlobalNinjaGenerator::AddRule(const std::string& name, @@ -727,7 +725,6 @@ bool cmGlobalNinjaGenerator::HasRule(const std::string &name) return (rule != this->Rules.end()); } -//---------------------------------------------------------------------------- // Private virtual overrides std::string cmGlobalNinjaGenerator::GetEditCacheCommand() const @@ -737,7 +734,6 @@ std::string cmGlobalNinjaGenerator::GetEditCacheCommand() const return cmSystemTools::GetCMakeGUICommand(); } -//---------------------------------------------------------------------------- void cmGlobalNinjaGenerator ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const { @@ -750,7 +746,6 @@ void cmGlobalNinjaGenerator gt->ObjectDirectory = dir; } -//---------------------------------------------------------------------------- // Private methods void cmGlobalNinjaGenerator::OpenBuildFileStream() diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 0098f1e..79b07ba 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -64,7 +64,6 @@ cmLocalGenerator* cmGlobalUnixMakefileGenerator3::CreateLocalGenerator( return new cmLocalUnixMakefileGenerator3(this, mf); } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::GetDocumentation(cmDocumentationEntry& entry) { @@ -72,7 +71,6 @@ void cmGlobalUnixMakefileGenerator3 entry.Brief = "Generates standard UNIX makefiles."; } -//---------------------------------------------------------------------------- std::string cmGlobalUnixMakefileGenerator3::GetEditCacheCommand() const { // If generating for an extra IDE, the edit_cache target cannot @@ -108,7 +106,6 @@ std::string cmGlobalUnixMakefileGenerator3::GetEditCacheCommand() const return edit_cmd? edit_cmd : ""; } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const @@ -277,7 +274,6 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2() } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3::WriteMainCMakefile() { // Open the output file. This should not be copy-if-different @@ -443,7 +439,6 @@ void cmGlobalUnixMakefileGenerator3 cmakefileStream << " )\n"; } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::WriteDirectoryRule2(std::ostream& ruleFileStream, @@ -515,7 +510,6 @@ cmGlobalUnixMakefileGenerator3 makeTarget, depends, no_commands, true); } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::WriteDirectoryRules2(std::ostream& ruleFileStream, @@ -546,7 +540,6 @@ cmGlobalUnixMakefileGenerator3 this->WriteDirectoryRule2(ruleFileStream, lg, "preinstall", true, true); } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::GenerateBuildCommand(std::vector<std::string>& makeCommand, const std::string& makeProgram, @@ -603,7 +596,6 @@ void cmGlobalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::WriteConvenienceRules(std::ostream& ruleFileStream, @@ -701,7 +693,6 @@ cmGlobalUnixMakefileGenerator3 } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::WriteConvenienceRules2(std::ostream& ruleFileStream, @@ -954,7 +945,6 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() } } -//---------------------------------------------------------------------------- size_t cmGlobalUnixMakefileGenerator3 ::CountProgressMarksInTarget(cmGeneratorTarget const* target, @@ -978,7 +968,6 @@ cmGlobalUnixMakefileGenerator3 return count; } -//---------------------------------------------------------------------------- size_t cmGlobalUnixMakefileGenerator3 ::CountProgressMarksInAll(cmLocalGenerator* lg) @@ -995,7 +984,6 @@ cmGlobalUnixMakefileGenerator3 return count; } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3::RecordTargetProgress( cmMakefileTargetGenerator* tg) @@ -1005,7 +993,6 @@ cmGlobalUnixMakefileGenerator3::RecordTargetProgress( tp.VariableFile = tg->GetProgressFileNameFull(); } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3::TargetProgress ::WriteProgressVariables(unsigned long total, unsigned long ¤t) @@ -1032,7 +1019,6 @@ cmGlobalUnixMakefileGenerator3::TargetProgress current += this->NumberOfActions; } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3 ::AppendGlobalTargetDepends(std::vector<std::string>& depends, @@ -1057,7 +1043,6 @@ cmGlobalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmGlobalUnixMakefileGenerator3::WriteHelpRule (std::ostream& ruleFileStream, cmLocalUnixMakefileGenerator3 *lg) { diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 4376dd9..441c2df 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -87,13 +87,11 @@ public: virtual bool SupportsToolset() const { return true; } }; -//---------------------------------------------------------------------------- cmGlobalGeneratorFactory* cmGlobalVisualStudio10Generator::NewFactory() { return new Factory; } -//---------------------------------------------------------------------------- cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio8Generator(cm, name, platformName) @@ -109,7 +107,6 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(cmake* cm, this->Version = VS10; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::MatchesGeneratorName( const std::string& name) const @@ -122,7 +119,6 @@ cmGlobalVisualStudio10Generator::MatchesGeneratorName( return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, cmMakefile* mf) { @@ -135,7 +131,6 @@ bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, return this->cmGlobalVisualStudio8Generator::SetSystemName(s, mf); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::SetGeneratorPlatform(std::string const& p, cmMakefile* mf) @@ -154,7 +149,6 @@ cmGlobalVisualStudio10Generator::SetGeneratorPlatform(std::string const& p, return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts, cmMakefile* mf) @@ -177,7 +171,6 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts, return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf) { if (this->SystemName == "Windows") @@ -239,13 +232,11 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::InitializeWindows(cmMakefile*) { return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf) { if (this->DefaultPlatformName != "Win32") @@ -262,7 +253,6 @@ bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::InitializeWindowsPhone(cmMakefile* mf) { std::ostringstream e; @@ -271,7 +261,6 @@ bool cmGlobalVisualStudio10Generator::InitializeWindowsPhone(cmMakefile* mf) return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::InitializeWindowsStore(cmMakefile* mf) { std::ostringstream e; @@ -280,7 +269,6 @@ bool cmGlobalVisualStudio10Generator::InitializeWindowsStore(cmMakefile* mf) return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset( std::string& toolset) const @@ -289,7 +277,6 @@ cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset( return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset( std::string& toolset) const @@ -298,7 +285,6 @@ cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset( return false; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio10Generator::SelectWindowsCEToolset() const { if (this->SystemVersion == "8.0") @@ -308,7 +294,6 @@ std::string cmGlobalVisualStudio10Generator::SelectWindowsCEToolset() const return ""; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio10Generator::WriteSLNHeader(std::ostream& fout) { fout << "Microsoft Visual Studio Solution File, Format Version 11.00\n"; @@ -362,7 +347,6 @@ void cmGlobalVisualStudio10Generator::Generate() } } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio10Generator ::EnableLanguage(std::vector<std::string>const & lang, cmMakefile *mf, bool optional) @@ -370,7 +354,6 @@ void cmGlobalVisualStudio10Generator cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional); } -//---------------------------------------------------------------------------- const char* cmGlobalVisualStudio10Generator::GetPlatformToolset() const { if(!this->GeneratorToolset.empty()) @@ -384,7 +367,6 @@ const char* cmGlobalVisualStudio10Generator::GetPlatformToolset() const return 0; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio10Generator::FindMakeProgram(cmMakefile* mf) { this->cmGlobalVisualStudio8Generator::FindMakeProgram(mf); @@ -392,7 +374,6 @@ void cmGlobalVisualStudio10Generator::FindMakeProgram(cmMakefile* mf) this->GetMSBuildCommand().c_str()); } -//---------------------------------------------------------------------------- std::string const& cmGlobalVisualStudio10Generator::GetMSBuildCommand() { if(!this->MSBuildCommandInitialized) @@ -403,7 +384,6 @@ std::string const& cmGlobalVisualStudio10Generator::GetMSBuildCommand() return this->MSBuildCommand; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio10Generator::FindMSBuildCommand() { std::string msbuild; @@ -421,7 +401,6 @@ std::string cmGlobalVisualStudio10Generator::FindMSBuildCommand() return msbuild; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio10Generator::FindDevEnvCommand() { if(this->ExpressEdition) @@ -436,7 +415,6 @@ std::string cmGlobalVisualStudio10Generator::FindDevEnvCommand() return this->cmGlobalVisualStudio71Generator::FindDevEnvCommand(); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio10Generator::GenerateBuildCommand( std::vector<std::string>& makeCommand, const std::string& makeProgram, @@ -541,7 +519,6 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand( makeOptions.begin(), makeOptions.end()); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf) { if(this->GetPlatformToolset()) @@ -579,7 +556,6 @@ bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf) } } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio10Generator ::GenerateRuleFile(std::string const& output) const @@ -597,7 +573,6 @@ cmGlobalVisualStudio10Generator return ruleFile; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio10Generator::PathTooLong( cmGeneratorTarget *target, cmSourceFile const* sf, std::string const& sfRel) @@ -614,19 +589,16 @@ void cmGlobalVisualStudio10Generator::PathTooLong( } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio10Generator::IsNsightTegra() const { return !this->NsightTegraVersion.empty(); } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio10Generator::GetNsightTegraVersion() const { return this->NsightTegraVersion; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio10Generator::GetInstalledNsightTegraVersion() { std::string version; diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index de6fc43..1a17c6f 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -101,13 +101,11 @@ public: virtual bool SupportsToolset() const { return true; } }; -//---------------------------------------------------------------------------- cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory() { return new Factory; } -//---------------------------------------------------------------------------- cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator(cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio10Generator(cm, name, platformName) @@ -120,7 +118,6 @@ cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator(cmake* cm, this->Version = VS11; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::MatchesGeneratorName( const std::string& name) const @@ -133,7 +130,6 @@ cmGlobalVisualStudio11Generator::MatchesGeneratorName( return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::InitializeWindowsPhone(cmMakefile* mf) { if(!this->SelectWindowsPhoneToolset(this->DefaultPlatformToolset)) @@ -156,7 +152,6 @@ bool cmGlobalVisualStudio11Generator::InitializeWindowsPhone(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::InitializeWindowsStore(cmMakefile* mf) { if(!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset)) @@ -179,7 +174,6 @@ bool cmGlobalVisualStudio11Generator::InitializeWindowsStore(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset( std::string& toolset) const @@ -201,7 +195,6 @@ cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset( this->cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset(toolset); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset( std::string& toolset) const @@ -223,7 +216,6 @@ cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset( this->cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset(toolset); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout) { fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n"; @@ -237,7 +229,6 @@ void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout) } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::UseFolderProperty() { // Intentionally skip up to the top-level class implementation. @@ -246,7 +237,6 @@ bool cmGlobalVisualStudio11Generator::UseFolderProperty() return cmGlobalGenerator::UseFolderProperty(); } -//---------------------------------------------------------------------------- std::set<std::string> cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs() { @@ -279,7 +269,6 @@ cmGlobalVisualStudio11Generator::GetInstalledWindowsCESDKs() return ret; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::NeedsDeploy(cmState::TargetType type) const { @@ -293,7 +282,6 @@ cmGlobalVisualStudio11Generator::NeedsDeploy(cmState::TargetType type) const return cmGlobalVisualStudio10Generator::NeedsDeploy(type); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::IsWindowsDesktopToolsetInstalled() const { @@ -314,7 +302,6 @@ cmGlobalVisualStudio11Generator::IsWindowsDesktopToolsetInstalled() const cmSystemTools::KeyWOW64_32); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::IsWindowsPhoneToolsetInstalled() const { @@ -330,7 +317,6 @@ cmGlobalVisualStudio11Generator::IsWindowsPhoneToolsetInstalled() const return !path.empty(); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio11Generator::IsWindowsStoreToolsetInstalled() const { diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index bfd908f..10308a3 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -81,13 +81,11 @@ public: virtual bool SupportsToolset() const { return true; } }; -//---------------------------------------------------------------------------- cmGlobalGeneratorFactory* cmGlobalVisualStudio12Generator::NewFactory() { return new Factory; } -//---------------------------------------------------------------------------- cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator(cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio11Generator(cm, name, platformName) @@ -100,7 +98,6 @@ cmGlobalVisualStudio12Generator::cmGlobalVisualStudio12Generator(cmake* cm, this->Version = VS12; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::MatchesGeneratorName( const std::string& name) const @@ -113,7 +110,6 @@ cmGlobalVisualStudio12Generator::MatchesGeneratorName( return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::InitializeWindowsPhone(cmMakefile* mf) { if(!this->SelectWindowsPhoneToolset(this->DefaultPlatformToolset)) @@ -136,7 +132,6 @@ bool cmGlobalVisualStudio12Generator::InitializeWindowsPhone(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::InitializeWindowsStore(cmMakefile* mf) { if(!this->SelectWindowsStoreToolset(this->DefaultPlatformToolset)) @@ -159,7 +154,6 @@ bool cmGlobalVisualStudio12Generator::InitializeWindowsStore(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::SelectWindowsPhoneToolset( std::string& toolset) const @@ -181,7 +175,6 @@ cmGlobalVisualStudio12Generator::SelectWindowsPhoneToolset( this->cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset(toolset); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset( std::string& toolset) const @@ -203,7 +196,6 @@ cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset( this->cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset(toolset); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio12Generator::WriteSLNHeader(std::ostream& fout) { fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n"; @@ -217,7 +209,6 @@ void cmGlobalVisualStudio12Generator::WriteSLNHeader(std::ostream& fout) } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::IsWindowsDesktopToolsetInstalled() const { @@ -231,7 +222,6 @@ cmGlobalVisualStudio12Generator::IsWindowsDesktopToolsetInstalled() const cmSystemTools::KeyWOW64_32); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::IsWindowsPhoneToolsetInstalled() const { @@ -246,7 +236,6 @@ cmGlobalVisualStudio12Generator::IsWindowsPhoneToolsetInstalled() const return !path.empty(); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio12Generator::IsWindowsStoreToolsetInstalled() const { diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index 893cc7b..8f93e17 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -81,13 +81,11 @@ public: virtual bool SupportsToolset() const { return true; } }; -//---------------------------------------------------------------------------- cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory() { return new Factory; } -//---------------------------------------------------------------------------- cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator(cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio12Generator(cm, name, platformName) @@ -100,7 +98,6 @@ cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator(cmake* cm, this->Version = VS14; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio14Generator::MatchesGeneratorName( const std::string& name) const @@ -113,7 +110,6 @@ cmGlobalVisualStudio14Generator::MatchesGeneratorName( return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf) { if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) @@ -123,7 +119,6 @@ bool cmGlobalVisualStudio14Generator::InitializeWindows(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio14Generator::InitializeWindowsStore(cmMakefile* mf) { std::ostringstream e; @@ -151,7 +146,6 @@ bool cmGlobalVisualStudio14Generator::InitializeWindowsStore(cmMakefile* mf) return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf, bool required) { @@ -170,7 +164,6 @@ bool cmGlobalVisualStudio14Generator::SelectWindows10SDK(cmMakefile* mf, return true; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset( std::string& toolset) const @@ -192,7 +185,6 @@ cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset( this->cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset(toolset); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout) { // Visual Studio 14 writes .sln format 12.00 @@ -207,7 +199,6 @@ void cmGlobalVisualStudio14Generator::WriteSLNHeader(std::ostream& fout) } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const { @@ -220,7 +211,6 @@ cmGlobalVisualStudio14Generator::IsWindowsDesktopToolsetInstalled() const vc14, cmSystemTools::KeyWOW64_32); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio14Generator::IsWindowsStoreToolsetInstalled() const { @@ -243,7 +233,6 @@ struct NoWindowsH }; #endif -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion() { #if defined(_WIN32) && !defined(__CYGWIN__) diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 68a7510..2aec245 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -17,7 +17,6 @@ #include "cmMakefile.h" #include "cmake.h" -//---------------------------------------------------------------------------- cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(cmake* cm, const std::string& platformName) : cmGlobalVisualStudio7Generator(cm, platformName) @@ -26,7 +25,6 @@ cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(cmake* cm, this->Version = VS71; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio71Generator::GetUserMacrosDirectory() { // Macros not supported on Visual Studio 7.1 and earlier because @@ -65,7 +63,6 @@ std::string cmGlobalVisualStudio71Generator::GetUserMacrosDirectory() #endif } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio71Generator::GetUserMacrosRegKeyBase() { // Macros not supported on Visual Studio 7.1 and earlier because @@ -79,7 +76,6 @@ std::string cmGlobalVisualStudio71Generator::GetUserMacrosRegKeyBase() #endif } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio71Generator ::WriteSLNFile(std::ostream& fout, cmLocalGenerator* root, @@ -149,7 +145,6 @@ void cmGlobalVisualStudio71Generator this->WriteSLNFooter(fout); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio71Generator ::WriteSolutionConfigurations(std::ostream& fout, @@ -164,7 +159,6 @@ cmGlobalVisualStudio71Generator fout << "\tEndGlobalSection\n"; } -//---------------------------------------------------------------------------- // Write a dsp file into the SLN file, // Note, that dependencies from executables to // the libraries it uses are also done here @@ -218,7 +212,6 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout, } } -//---------------------------------------------------------------------------- // Write a dsp file into the SLN file, // Note, that dependencies from executables to // the libraries it uses are also done here @@ -246,7 +239,6 @@ cmGlobalVisualStudio71Generator } } -//---------------------------------------------------------------------------- // Write a dsp file into the SLN file, Note, that dependencies from // executables to the libraries it uses are also done here void cmGlobalVisualStudio71Generator @@ -289,7 +281,6 @@ void cmGlobalVisualStudio71Generator } -//---------------------------------------------------------------------------- // Write a dsp file into the SLN file, Note, that dependencies from // executables to the libraries it uses are also done here void cmGlobalVisualStudio71Generator @@ -317,14 +308,12 @@ void cmGlobalVisualStudio71Generator } } -//---------------------------------------------------------------------------- // ouput standard header for dsw file void cmGlobalVisualStudio71Generator::WriteSLNHeader(std::ostream& fout) { fout << "Microsoft Visual Studio Solution File, Format Version 8.00\n"; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio71Generator ::GetDocumentation(cmDocumentationEntry& entry) { diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index a5ee336..6fefa9e 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -22,7 +22,6 @@ #include <assert.h> -//---------------------------------------------------------------------------- static cmVS7FlagTable cmVS7ExtraFlagTable[] = { // Precompiled header and related options. Note that the @@ -146,7 +145,6 @@ void cmGlobalVisualStudio7Generator } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio7Generator::FindMakeProgram(cmMakefile* mf) { this->cmGlobalVisualStudioGenerator::FindMakeProgram(mf); @@ -154,7 +152,6 @@ void cmGlobalVisualStudio7Generator::FindMakeProgram(cmMakefile* mf) this->GetDevEnvCommand().c_str()); } -//---------------------------------------------------------------------------- std::string const& cmGlobalVisualStudio7Generator::GetDevEnvCommand() { if(!this->DevEnvCommandInitialized) @@ -165,7 +162,6 @@ std::string const& cmGlobalVisualStudio7Generator::GetDevEnvCommand() return this->DevEnvCommand; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio7Generator::FindDevEnvCommand() { std::string vscmd; @@ -180,7 +176,6 @@ std::string cmGlobalVisualStudio7Generator::FindDevEnvCommand() return vscmd; } -//---------------------------------------------------------------------------- const char* cmGlobalVisualStudio7Generator::ExternalProjectType( const char* location) { @@ -215,7 +210,6 @@ const char* cmGlobalVisualStudio7Generator::ExternalProjectType( } return "8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942"; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio7Generator::GenerateBuildCommand( std::vector<std::string>& makeCommand, const std::string& makeProgram, @@ -290,7 +284,6 @@ cmLocalGenerator *cmGlobalVisualStudio7Generator::CreateLocalGenerator( return lg; } -//---------------------------------------------------------------------------- std::string const& cmGlobalVisualStudio7Generator::GetPlatformName() const { if(!this->GeneratorPlatform.empty()) @@ -300,7 +293,6 @@ std::string const& cmGlobalVisualStudio7Generator::GetPlatformName() const return this->DefaultPlatformName; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio7Generator::SetSystemName(std::string const& s, cmMakefile* mf) { @@ -309,7 +301,6 @@ bool cmGlobalVisualStudio7Generator::SetSystemName(std::string const& s, return this->cmGlobalVisualStudioGenerator::SetSystemName(s, mf); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio7Generator::SetGeneratorPlatform(std::string const& p, cmMakefile* mf) { @@ -553,7 +544,6 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends( } } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio7Generator::WriteFolders(std::ostream& fout) { const char *prefix = "CMAKE_FOLDER_GUID_"; @@ -582,7 +572,6 @@ void cmGlobalVisualStudio7Generator::WriteFolders(std::ostream& fout) } } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio7Generator::WriteFoldersContent(std::ostream& fout) { for(std::map<std::string,std::set<std::string> >::iterator iter = @@ -602,7 +591,6 @@ void cmGlobalVisualStudio7Generator::WriteFoldersContent(std::ostream& fout) } } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio7Generator::ConvertToSolutionPath(const char* path) { @@ -687,7 +675,6 @@ void cmGlobalVisualStudio7Generator::WriteSLNFooter(std::ostream& fout) fout << "EndGlobal\n"; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio7Generator::WriteUtilityDepend( cmGeneratorTarget const* target) @@ -751,7 +738,6 @@ cmGlobalVisualStudio7Generator::WriteUtilityDepend( return pname; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio7Generator::GetGUID(std::string const& name) { std::string const& guidStoreName = name + "_GUID_CMAKE"; @@ -776,7 +762,6 @@ std::string cmGlobalVisualStudio7Generator::GetGUID(std::string const& name) return cmSystemTools::UpperCase(guid); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio7Generator ::AppendDirectoryForConfig(const std::string& prefix, diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 47ac66d..76baf0d 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -90,13 +90,11 @@ public: virtual bool SupportsToolset() const { return false; } }; -//---------------------------------------------------------------------------- cmGlobalGeneratorFactory* cmGlobalVisualStudio8Generator::NewFactory() { return new Factory; } -//---------------------------------------------------------------------------- cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator(cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio71Generator(cm, platformName) @@ -111,7 +109,6 @@ cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator(cmake* cm, "ProductDir", vc8Express, cmSystemTools::KeyWOW64_32); } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio8Generator::FindDevEnvCommand() { // First look for VCExpress. @@ -131,7 +128,6 @@ std::string cmGlobalVisualStudio8Generator::FindDevEnvCommand() return this->cmGlobalVisualStudio71Generator::FindDevEnvCommand(); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator ::EnableLanguage(std::vector<std::string>const & lang, cmMakefile *mf, bool optional) @@ -148,7 +144,6 @@ void cmGlobalVisualStudio8Generator cmGlobalVisualStudio7Generator::EnableLanguage(lang, mf, optional); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator::AddPlatformDefinitions(cmMakefile* mf) { if(this->TargetsWindowsCE()) @@ -158,7 +153,6 @@ void cmGlobalVisualStudio8Generator::AddPlatformDefinitions(cmMakefile* mf) } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio8Generator::SetGeneratorPlatform(std::string const& p, cmMakefile* mf) { @@ -173,7 +167,6 @@ bool cmGlobalVisualStudio8Generator::SetGeneratorPlatform(std::string const& p, } } -//---------------------------------------------------------------------------- // ouput standard header for dsw file void cmGlobalVisualStudio8Generator::WriteSLNHeader(std::ostream& fout) { @@ -181,7 +174,6 @@ void cmGlobalVisualStudio8Generator::WriteSLNHeader(std::ostream& fout) fout << "# Visual Studio 2005\n"; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator ::GetDocumentation(cmDocumentationEntry& entry) { @@ -189,19 +181,16 @@ void cmGlobalVisualStudio8Generator entry.Brief = "Generates Visual Studio 8 2005 project files."; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator::Configure() { this->cmGlobalVisualStudio7Generator::Configure(); } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio8Generator::UseFolderProperty() { return IsExpressEdition() ? false : cmGlobalGenerator::UseFolderProperty(); } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio8Generator::GetUserMacrosDirectory() { // Some VS8 sp0 versions cannot run macros. @@ -239,13 +228,11 @@ std::string cmGlobalVisualStudio8Generator::GetUserMacrosDirectory() return path; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio8Generator::GetUserMacrosRegKeyBase() { return "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros"; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio8Generator::AddCheckTarget() { // Add a special target on which all other targets depend that @@ -361,7 +348,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget() return true; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator::AddExtraIDETargets() { cmGlobalVisualStudio7Generator::AddExtraIDETargets(); @@ -384,7 +370,6 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets() } } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator ::WriteSolutionConfigurations(std::ostream& fout, @@ -400,7 +385,6 @@ cmGlobalVisualStudio8Generator fout << "\tEndGlobalSection\n"; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator ::WriteProjectConfigurations( @@ -439,7 +423,6 @@ cmGlobalVisualStudio8Generator } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio8Generator::NeedsDeploy(cmState::TargetType type) const { @@ -448,7 +431,6 @@ cmGlobalVisualStudio8Generator::NeedsDeploy(cmState::TargetType type) const return this->TargetsWindowsCE() && needsDeploy; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio8Generator::ComputeTargetDepends() { // Skip over the cmGlobalVisualStudioGenerator implementation! @@ -456,7 +438,6 @@ bool cmGlobalVisualStudio8Generator::ComputeTargetDepends() return this->cmGlobalGenerator::ComputeTargetDepends(); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator::WriteProjectDepends( std::ostream& fout, const std::string&, const char*, cmGeneratorTarget const* gt) @@ -475,7 +456,6 @@ void cmGlobalVisualStudio8Generator::WriteProjectDepends( } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies( cmGeneratorTarget *target) { @@ -500,7 +480,6 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies( return false; } -//---------------------------------------------------------------------------- static cmVS7FlagTable cmVS8ExtraFlagTable[] = { {"CallingConvention", "Gd", "cdecl", "0", 0 }, diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx index c2ef332..6052856 100644 --- a/Source/cmGlobalVisualStudio9Generator.cxx +++ b/Source/cmGlobalVisualStudio9Generator.cxx @@ -94,13 +94,11 @@ public: virtual bool SupportsToolset() const { return false; } }; -//---------------------------------------------------------------------------- cmGlobalGeneratorFactory* cmGlobalVisualStudio9Generator::NewFactory() { return new Factory; } -//---------------------------------------------------------------------------- cmGlobalVisualStudio9Generator::cmGlobalVisualStudio9Generator(cmake* cm, const std::string& name, const std::string& platformName) : cmGlobalVisualStudio8Generator(cm, name, platformName) @@ -112,14 +110,12 @@ cmGlobalVisualStudio9Generator::cmGlobalVisualStudio9Generator(cmake* cm, "ProductDir", vc9Express, cmSystemTools::KeyWOW64_32); } -//---------------------------------------------------------------------------- void cmGlobalVisualStudio9Generator::WriteSLNHeader(std::ostream& fout) { fout << "Microsoft Visual Studio Solution File, Format Version 10.00\n"; fout << "# Visual Studio 2008\n"; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio9Generator::GetUserMacrosDirectory() { std::string base; @@ -146,7 +142,6 @@ std::string cmGlobalVisualStudio9Generator::GetUserMacrosDirectory() return path; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudio9Generator::GetUserMacrosRegKeyBase() { return "Software\\Microsoft\\VisualStudio\\9.0\\vsmacros"; diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 479b53c..4f6aa20 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -22,7 +22,6 @@ #include "cmTarget.h" #include <cmsys/Encoding.hxx> -//---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm) : cmGlobalGenerator(cm) { @@ -30,32 +29,27 @@ cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm) cm->GetState()->SetWindowsVSIDE(true); } -//---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::~cmGlobalVisualStudioGenerator() { } -//---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::VSVersion cmGlobalVisualStudioGenerator::GetVersion() const { return this->Version; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator::SetVersion(VSVersion v) { this->Version = v; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudioGenerator::GetRegistryBase() { return cmGlobalVisualStudioGenerator::GetRegistryBase( this->GetIDEVersion()); } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudioGenerator::GetRegistryBase( const char* version) { @@ -63,7 +57,6 @@ std::string cmGlobalVisualStudioGenerator::GetRegistryBase( return key + version; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator::AddExtraIDETargets() { // Add a special target that depends on ALL projects for easy build @@ -136,7 +129,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets() } } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const { @@ -157,7 +149,6 @@ void cmGlobalVisualStudioGenerator gt->ObjectDirectory = dir; } -//---------------------------------------------------------------------------- bool IsVisualStudioMacrosFileRegistered(const std::string& macrosFile, const std::string& regKeyBase, std::string& nextAvailableSubKeyName); @@ -165,7 +156,6 @@ bool IsVisualStudioMacrosFileRegistered(const std::string& macrosFile, void RegisterVisualStudioMacros(const std::string& macrosFile, const std::string& regKeyBase); -//---------------------------------------------------------------------------- #define CMAKE_VSMACROS_FILENAME \ "CMakeVSMacros2.vsmacros" @@ -175,7 +165,6 @@ void RegisterVisualStudioMacros(const std::string& macrosFile, #define CMAKE_VSMACROS_STOP_MACRONAME \ "Macros.CMakeVSMacros2.Macros.StopBuild" -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros() { std::string dir = this->GetUserMacrosDirectory(); @@ -209,7 +198,6 @@ void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros() } } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator ::CallVisualStudioMacro(MacroName m, @@ -282,19 +270,16 @@ cmGlobalVisualStudioGenerator } } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudioGenerator::GetUserMacrosDirectory() { return ""; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudioGenerator::GetUserMacrosRegKeyBase() { return ""; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator::FillLinkClosure( const cmGeneratorTarget *target, TargetSet& linked) @@ -314,7 +299,6 @@ void cmGlobalVisualStudioGenerator::FillLinkClosure( } } -//---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::TargetSet const& cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target) { @@ -328,7 +312,6 @@ cmGlobalVisualStudioGenerator::GetTargetLinkClosure(cmGeneratorTarget* target) return i->second; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator::FollowLinkDepends( const cmGeneratorTarget *target, std::set<const cmGeneratorTarget *> &linked) @@ -354,7 +337,6 @@ void cmGlobalVisualStudioGenerator::FollowLinkDepends( } } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudioGenerator::ComputeTargetDepends() { if(!this->cmGlobalGenerator::ComputeTargetDepends()) @@ -379,13 +361,11 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends() return true; } -//---------------------------------------------------------------------------- static bool VSLinkable(cmGeneratorTarget const* t) { return t->IsLinkable() || t->GetType() == cmState::OBJECT_LIBRARY; } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends( cmGeneratorTarget* target) { @@ -484,7 +464,6 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends( } } -//---------------------------------------------------------------------------- void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf) { // Visual Studio generators know how to lookup their build tool @@ -497,7 +476,6 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf) } } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudioGenerator::GetUtilityDepend( cmGeneratorTarget const* target) @@ -512,7 +490,6 @@ cmGlobalVisualStudioGenerator::GetUtilityDepend( return i->second; } -//---------------------------------------------------------------------------- std::string cmGlobalVisualStudioGenerator::GetStartupProjectName( cmLocalGenerator const* root) const @@ -538,10 +515,8 @@ cmGlobalVisualStudioGenerator::GetStartupProjectName( return this->GetAllTargetName(); } -//---------------------------------------------------------------------------- #include <windows.h> -//---------------------------------------------------------------------------- bool IsVisualStudioMacrosFileRegistered(const std::string& macrosFile, const std::string& regKeyBase, std::string& nextAvailableSubKeyName) @@ -712,7 +687,6 @@ bool IsVisualStudioMacrosFileRegistered(const std::string& macrosFile, return macrosRegistered; } -//---------------------------------------------------------------------------- void WriteVSMacrosFileRegistryEntry( const std::string& nextAvailableSubKeyName, const std::string& macrosFile, @@ -785,7 +759,6 @@ void WriteVSMacrosFileRegistryEntry( } } -//---------------------------------------------------------------------------- void RegisterVisualStudioMacros(const std::string& macrosFile, const std::string& regKeyBase) { @@ -872,7 +845,6 @@ cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmGeneratorTarget const* gt) return false; } -//---------------------------------------------------------------------------- bool cmGlobalVisualStudioGenerator::TargetCompare ::operator()(cmGeneratorTarget const* l, cmGeneratorTarget const* r) const @@ -891,7 +863,6 @@ cmGlobalVisualStudioGenerator::TargetCompare return l->GetName() < r->GetName(); } -//---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::OrderedTargetDependSet ::OrderedTargetDependSet(TargetDependSet const& targets, std::string const& first): @@ -900,7 +871,6 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet this->insert(targets.begin(), targets.end()); } -//---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::OrderedTargetDependSet ::OrderedTargetDependSet(TargetSet const& targets, std::string const& first): diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx index 63f82bb..461b9b1 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.cxx +++ b/Source/cmGlobalWatcomWMakeGenerator.cxx @@ -50,7 +50,6 @@ void cmGlobalWatcomWMakeGenerator this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional); } -//---------------------------------------------------------------------------- void cmGlobalWatcomWMakeGenerator ::GetDocumentation(cmDocumentationEntry& entry) { diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e9ad49c..022b802 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -26,7 +26,6 @@ #include <cmsys/auto_ptr.hxx> -//---------------------------------------------------------------------------- #if defined(CMAKE_BUILD_WITH_CMAKE) #include "cmXMLParser.h" @@ -130,7 +129,6 @@ public: virtual bool SupportsToolset() const { return true; } }; -//---------------------------------------------------------------------------- cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(cmake* cm, std::string const& version) : cmGlobalGenerator(cm) @@ -151,13 +149,11 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(cmake* cm, this->XcodeBuildCommandInitialized = false; } -//---------------------------------------------------------------------------- cmGlobalGeneratorFactory* cmGlobalXCodeGenerator::NewFactory() { return new Factory; } -//---------------------------------------------------------------------------- cmGlobalGenerator* cmGlobalXCodeGenerator::Factory ::CreateGlobalGenerator(const std::string& name, cmake* cm) const { @@ -207,7 +203,6 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::Factory #endif } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::FindMakeProgram(cmMakefile* mf) { // The Xcode generator knows how to lookup its build tool @@ -220,7 +215,6 @@ void cmGlobalXCodeGenerator::FindMakeProgram(cmMakefile* mf) } } -//---------------------------------------------------------------------------- std::string const& cmGlobalXCodeGenerator::GetXcodeBuildCommand() { if(!this->XcodeBuildCommandInitialized) @@ -231,7 +225,6 @@ std::string const& cmGlobalXCodeGenerator::GetXcodeBuildCommand() return this->XcodeBuildCommand; } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::FindXcodeBuildCommand() { if (this->XcodeVersion >= 40) @@ -250,7 +243,6 @@ std::string cmGlobalXCodeGenerator::FindXcodeBuildCommand() } } -//---------------------------------------------------------------------------- bool cmGlobalXCodeGenerator::SetGeneratorToolset(std::string const& ts, cmMakefile* mf) { @@ -270,7 +262,6 @@ bool cmGlobalXCodeGenerator::SetGeneratorToolset(std::string const& ts, } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const& lang, cmMakefile * mf, bool optional) @@ -307,7 +298,6 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const& } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::GenerateBuildCommand( std::vector<std::string>& makeCommand, @@ -371,7 +361,6 @@ cmGlobalXCodeGenerator::GenerateBuildCommand( makeOptions.begin(), makeOptions.end()); } -//---------------------------------------------------------------------------- ///! Create a local generator appropriate to this Global Generator cmLocalGenerator * cmGlobalXCodeGenerator::CreateLocalGenerator(cmMakefile* mf) @@ -410,7 +399,6 @@ void cmGlobalXCodeGenerator::Generate() } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root) { this->CurrentProject = root->GetProjectName(); @@ -429,7 +417,6 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root) this->CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make"; } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::PostBuildMakeTarget(std::string const& tName, std::string const& configName) @@ -444,10 +431,8 @@ cmGlobalXCodeGenerator::PostBuildMakeTarget(std::string const& tName, return out; } -//---------------------------------------------------------------------------- #define CMAKE_CHECK_BUILD_SYSTEM_TARGET "ZERO_CHECK" -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root, std::vector<cmLocalGenerator*>& gens) @@ -570,7 +555,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root, } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::CreateReRunCMakeFile( cmLocalGenerator* root, std::vector<cmLocalGenerator*> const& gens) { @@ -623,21 +607,18 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile( root->GetBinaryDirectory()) << "\n"; } -//---------------------------------------------------------------------------- static bool objectIdLessThan(cmXCodeObject* l, cmXCodeObject* r) { return l->GetId() < r->GetId(); } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::SortXCodeObjects() { std::sort(this->XCodeObjects.begin(), this->XCodeObjects.end(), objectIdLessThan); } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::ClearXCodeObjects() { this->TargetDoneSet.clear(); @@ -654,7 +635,6 @@ void cmGlobalXCodeGenerator::ClearXCodeObjects() this->FileRefs.clear(); } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::addObject(cmXCodeObject *obj) { if(obj->GetType() == cmXCodeObject::OBJECT) @@ -675,7 +655,6 @@ void cmGlobalXCodeGenerator::addObject(cmXCodeObject *obj) this->XCodeObjects.push_back(obj); } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateObject(cmXCodeObject::PBXType ptype) { @@ -692,7 +671,6 @@ cmGlobalXCodeGenerator::CreateObject(cmXCodeObject::PBXType ptype) return obj; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateObject(cmXCodeObject::Type type) { @@ -701,7 +679,6 @@ cmGlobalXCodeGenerator::CreateObject(cmXCodeObject::Type type) return obj; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateString(const std::string& s) { @@ -710,7 +687,6 @@ cmGlobalXCodeGenerator::CreateString(const std::string& s) return obj; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator ::CreateObjectReference(cmXCodeObject* ref) { @@ -719,7 +695,6 @@ cmXCodeObject* cmGlobalXCodeGenerator return obj; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator ::CreateFlatClone(cmXCodeObject* orig) { @@ -728,7 +703,6 @@ cmXCodeObject* cmGlobalXCodeGenerator return obj; } -//---------------------------------------------------------------------------- std::string GetGroupMapKeyFromPath(cmGeneratorTarget* target, const std::string& fullpath) { @@ -738,14 +712,12 @@ GetGroupMapKeyFromPath(cmGeneratorTarget* target, const std::string& fullpath) return key; } -//---------------------------------------------------------------------------- std::string GetGroupMapKey(cmGeneratorTarget* target, cmSourceFile* sf) { return GetGroupMapKeyFromPath(target, sf->GetFullPath()); } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath( const std::string &fullpath, @@ -766,7 +738,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFileFromPath( return buildFile; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, cmSourceFile* sf, @@ -848,7 +819,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, return buildFile; } -//---------------------------------------------------------------------------- std::string GetSourcecodeValueFromFileExtension(const std::string& _ext, const std::string& lang, @@ -940,7 +910,6 @@ GetSourcecodeValueFromFileExtension(const std::string& _ext, return sourcecode; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath( const std::string &fullpath, @@ -1022,7 +991,6 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath( return fileRef; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf, cmGeneratorTarget* target) @@ -1034,7 +1002,6 @@ cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf, sf->GetFullPath(), target, lang, sf); } -//---------------------------------------------------------------------------- bool cmGlobalXCodeGenerator::SpecialTargetEmitted(std::string const& tname) { if(tname == "ALL_BUILD" || tname == "XCODE_DEPEND_HELPER" || @@ -1051,7 +1018,6 @@ bool cmGlobalXCodeGenerator::SpecialTargetEmitted(std::string const& tname) return false; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen) { this->CurrentLocalGenerator = gen; @@ -1071,7 +1037,6 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen) } } -//---------------------------------------------------------------------------- struct cmSourceFilePathCompare { bool operator()(cmSourceFile* l, cmSourceFile* r) @@ -1080,7 +1045,6 @@ struct cmSourceFilePathCompare } }; -//---------------------------------------------------------------------------- struct cmCompareTargets { bool operator () (std::string const& a, std::string const& b) const @@ -1097,7 +1061,6 @@ struct cmCompareTargets } }; -//---------------------------------------------------------------------------- bool cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, std::vector<cmXCodeObject*>& @@ -1378,7 +1341,6 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, return true; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::ForceLinkerLanguages() { for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) @@ -1395,7 +1357,6 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguages() } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt) { // This matters only for targets that link. @@ -1440,7 +1401,6 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt) } } -//---------------------------------------------------------------------------- bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf) { const std::vector<std::string>& hdrExts = @@ -1449,7 +1409,6 @@ bool cmGlobalXCodeGenerator::IsHeaderFile(cmSourceFile* sf) hdrExts.end()); } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateBuildPhase(const char* name, const char* name2, @@ -1478,7 +1437,6 @@ cmGlobalXCodeGenerator::CreateBuildPhase(const char* name, return buildPhase; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases, cmXCodeObject* sourceBuildPhase, @@ -1608,7 +1566,6 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases, } } -//---------------------------------------------------------------------------- // This function removes each occurrence of the flag and returns the last one // (i.e., the dominant flag in GCC) std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag, @@ -1642,7 +1599,6 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag, return retFlag; } -//---------------------------------------------------------------------------- // This function removes each matching occurrence of the expression and // returns the last one (i.e., the dominant flag in GCC) std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp, @@ -1715,7 +1671,6 @@ cmGlobalXCodeGenerator } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase, cmGeneratorTarget* target, @@ -1758,7 +1713,6 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase, this->CreateString("0")); } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator ::CreateCustomRulesMakefile(const char* makefileBasename, cmGeneratorTarget* target, @@ -1884,7 +1838,6 @@ void cmGlobalXCodeGenerator } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, cmXCodeObject* buildSettings, const std::string& configName) @@ -2564,7 +2517,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, } } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateUtilityTarget(cmGeneratorTarget* gtgt) { @@ -2643,7 +2595,6 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmGeneratorTarget* gtgt) return target; } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target, cmGeneratorTarget* gtgt) { @@ -2690,7 +2641,6 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target, return ""; } -//---------------------------------------------------------------------------- const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar( cmGeneratorTarget const* target) const { @@ -2706,7 +2656,6 @@ const char* cmGlobalXCodeGenerator::GetTargetLinkFlagsVar( } } -//---------------------------------------------------------------------------- const char* cmGlobalXCodeGenerator::GetTargetFileType( cmGeneratorTarget* target) { @@ -2733,7 +2682,6 @@ const char* cmGlobalXCodeGenerator::GetTargetFileType( return 0; } -//---------------------------------------------------------------------------- const char* cmGlobalXCodeGenerator::GetTargetProductType( cmGeneratorTarget* target) { @@ -2764,7 +2712,6 @@ const char* cmGlobalXCodeGenerator::GetTargetProductType( return 0; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt, cmXCodeObject* buildPhases) @@ -2835,7 +2782,6 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt, return target; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator::FindXCodeTarget(cmGeneratorTarget const* t) { @@ -2853,7 +2799,6 @@ cmGlobalXCodeGenerator::FindXCodeTarget(cmGeneratorTarget const* t) return i->second; } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::GetOrCreateId(const std::string& name, const std::string& id) { @@ -2873,7 +2818,6 @@ std::string cmGlobalXCodeGenerator::GetOrCreateId(const std::string& name, return id; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::AddDependTarget(cmXCodeObject* target, cmXCodeObject* dependTarget) { @@ -2910,7 +2854,6 @@ void cmGlobalXCodeGenerator::AddDependTarget(cmXCodeObject* target, } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::AppendOrAddBuildSetting(cmXCodeObject* settings, const char* attribute, const char* value) @@ -2932,7 +2875,6 @@ void cmGlobalXCodeGenerator::AppendOrAddBuildSetting(cmXCodeObject* settings, } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator ::AppendBuildSettingAttribute(cmXCodeObject* target, const char* attribute, @@ -2977,7 +2919,6 @@ void cmGlobalXCodeGenerator } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator ::AddDependAndLinkInformation(cmXCodeObject* target) { @@ -3111,7 +3052,6 @@ void cmGlobalXCodeGenerator } } -//---------------------------------------------------------------------------- bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root, std::vector<cmLocalGenerator*>& generators) @@ -3213,7 +3153,6 @@ cmXCodeObject *cmGlobalXCodeGenerator return group; } -//---------------------------------------------------------------------------- cmXCodeObject* cmGlobalXCodeGenerator ::CreateOrGetPBXGroup(cmGeneratorTarget* gtgt, cmSourceGroup* sg) { @@ -3309,7 +3248,6 @@ cmXCodeObject* cmGlobalXCodeGenerator return group; } -//---------------------------------------------------------------------------- bool cmGlobalXCodeGenerator ::CreateXCodeObjects(cmLocalGenerator* root, std::vector<cmLocalGenerator*>& @@ -3619,7 +3557,6 @@ bool cmGlobalXCodeGenerator return true; } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::GetObjectsNormalDirectory( const std::string &projName, @@ -3639,7 +3576,6 @@ cmGlobalXCodeGenerator::GetObjectsNormalDirectory( return dir; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::CreateXCodeDependHackTarget( std::vector<cmXCodeObject*>& targets) @@ -3787,7 +3723,6 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget( } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root, std::vector<cmLocalGenerator*>& @@ -3836,7 +3771,6 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root, root->GetBinaryDirectory()); } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::WriteXCodePBXProj(std::ostream& fout, cmLocalGenerator* , @@ -3876,7 +3810,6 @@ cmGlobalXCodeGenerator::WriteXCodePBXProj(std::ostream& fout, fout << "}\n"; } -//---------------------------------------------------------------------------- const char* cmGlobalXCodeGenerator::GetCMakeCFGIntDir() const { return this->XcodeVersion >= 21 ? @@ -3907,20 +3840,17 @@ std::string cmGlobalXCodeGenerator::ExpandCFGIntDir(const std::string& str, return tmp; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::GetDocumentation(cmDocumentationEntry& entry) { entry.Name = cmGlobalXCodeGenerator::GetActualName(); entry.Brief = "Generate Xcode project files."; } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::ConvertToRelativeForMake(const char* p) { return cmSystemTools::ConvertToOutputPath(p); } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::RelativeToSource(const char* p) { // We force conversion because Xcode breakpoints do not work unless @@ -3929,14 +3859,12 @@ std::string cmGlobalXCodeGenerator::RelativeToSource(const char* p) ConvertToRelativePath(this->ProjectSourceDirectoryComponents, p, true); } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::RelativeToBinary(const char* p) { return this->CurrentLocalGenerator-> ConvertToRelativePath(this->ProjectOutputDirectoryComponents, p); } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::XCodeEscapePath(const std::string& p) { if(p.find(' ') != p.npos) @@ -3949,7 +3877,6 @@ std::string cmGlobalXCodeGenerator::XCodeEscapePath(const std::string& p) return p; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator ::AppendDirectoryForConfig(const std::string& prefix, @@ -3968,7 +3895,6 @@ cmGlobalXCodeGenerator } } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::LookupFlags( const std::string& varNamePrefix, const std::string& varNameLang, @@ -3992,7 +3918,6 @@ std::string cmGlobalXCodeGenerator::LookupFlags( return default_flags; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::AppendDefines(BuildObjectListOrString& defs, const char* defines_list, bool dflag) @@ -4011,7 +3936,6 @@ void cmGlobalXCodeGenerator::AppendDefines(BuildObjectListOrString& defs, this->AppendDefines(defs, defines, dflag); } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::AppendDefines(BuildObjectListOrString& defs, std::vector<std::string> const& defines, @@ -4033,7 +3957,6 @@ cmGlobalXCodeGenerator::AppendDefines(BuildObjectListOrString& defs, } } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::AppendFlag(std::string& flags, std::string const& flag) { @@ -4100,7 +4023,6 @@ void cmGlobalXCodeGenerator::AppendFlag(std::string& flags, } } -//---------------------------------------------------------------------------- std::string cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmGeneratorTarget* target) { @@ -4113,7 +4035,6 @@ cmGlobalXCodeGenerator::ComputeInfoPListLocation(cmGeneratorTarget* target) return plist; } -//---------------------------------------------------------------------------- // Return true if the generated build tree may contain multiple builds. // i.e. "Can I build Debug and Release in the same tree?" bool cmGlobalXCodeGenerator::IsMultiConfig() @@ -4128,7 +4049,6 @@ bool cmGlobalXCodeGenerator::IsMultiConfig() return true; } -//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const { diff --git a/Source/cmIDEOptions.cxx b/Source/cmIDEOptions.cxx index 509602f..1c52519 100644 --- a/Source/cmIDEOptions.cxx +++ b/Source/cmIDEOptions.cxx @@ -15,7 +15,6 @@ #include <cmsys/String.h> -//---------------------------------------------------------------------------- cmIDEOptions::cmIDEOptions() { this->DoingDefine = false; @@ -28,12 +27,10 @@ cmIDEOptions::cmIDEOptions() } } -//---------------------------------------------------------------------------- cmIDEOptions::~cmIDEOptions() { } -//---------------------------------------------------------------------------- void cmIDEOptions::HandleFlag(const char* flag) { // If the last option was -D then this option is the definition. @@ -92,7 +89,6 @@ void cmIDEOptions::HandleFlag(const char* flag) this->StoreUnknownFlag(flag); } -//---------------------------------------------------------------------------- bool cmIDEOptions::CheckFlagTable(cmIDEFlagTable const* table, const char* flag, bool& flag_handled) { @@ -147,7 +143,6 @@ bool cmIDEOptions::CheckFlagTable(cmIDEFlagTable const* table, return false; } -//---------------------------------------------------------------------------- void cmIDEOptions::FlagMapUpdate(cmIDEFlagTable const* entry, const char* new_value) { @@ -167,13 +162,11 @@ void cmIDEOptions::FlagMapUpdate(cmIDEFlagTable const* entry, } } -//---------------------------------------------------------------------------- void cmIDEOptions::AddDefine(const std::string& def) { this->Defines.push_back(def); } -//---------------------------------------------------------------------------- void cmIDEOptions::AddDefines(const char* defines) { if(defines) @@ -182,33 +175,28 @@ void cmIDEOptions::AddDefines(const char* defines) cmSystemTools::ExpandListArgument(defines, this->Defines); } } -//---------------------------------------------------------------------------- void cmIDEOptions::AddDefines(const std::vector<std::string> &defines) { this->Defines.insert(this->Defines.end(), defines.begin(), defines.end()); } -//---------------------------------------------------------------------------- void cmIDEOptions::AddFlag(const char* flag, const char* value) { this->FlagMap[flag] = value; } -//---------------------------------------------------------------------------- void cmIDEOptions::AddFlag(const char* flag, std::vector<std::string> const& value) { this->FlagMap[flag] = value; } -//---------------------------------------------------------------------------- void cmIDEOptions::AppendFlag(std::string const& flag, std::string const& value) { this->FlagMap[flag].push_back(value); } -//---------------------------------------------------------------------------- void cmIDEOptions::AppendFlag(std::string const& flag, std::vector<std::string> const& value) { @@ -216,19 +204,16 @@ void cmIDEOptions::AppendFlag(std::string const& flag, std::copy(value.begin(), value.end(), std::back_inserter(fv)); } -//---------------------------------------------------------------------------- void cmIDEOptions::RemoveFlag(const char* flag) { this->FlagMap.erase(flag); } -//---------------------------------------------------------------------------- bool cmIDEOptions::HasFlag(std::string const& flag) const { return this->FlagMap.find(flag) != this->FlagMap.end(); } -//---------------------------------------------------------------------------- const char* cmIDEOptions::GetFlag(const char* flag) { // This method works only for single-valued flags! diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index d287568..c87b29b 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -112,7 +112,6 @@ bool cmInstallCommand::InitialPass(std::vector<std::string> const& args, return false; } -//---------------------------------------------------------------------------- bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args) { std::string component = this->DefaultComponentName; @@ -221,7 +220,6 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args) cmInstallCommandArguments args; };*/ -//---------------------------------------------------------------------------- bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) { // This is the TARGETS mode. @@ -836,7 +834,6 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args) { // This is the FILES mode. @@ -946,7 +943,6 @@ bool cmInstallCommand::HandleFilesMode(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args) { @@ -1306,7 +1302,6 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args) { // This is the EXPORT mode. @@ -1464,7 +1459,6 @@ bool cmInstallCommand::MakeFilesFullPath(const char* modeName, return true; } -//---------------------------------------------------------------------------- bool cmInstallCommand::CheckCMP0006(bool& failure) { switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0006)) diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 6ad6c75..99141df 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -14,7 +14,6 @@ #include "cmGeneratorExpression.h" #include "cmLocalGenerator.h" -//---------------------------------------------------------------------------- cmInstallDirectoryGenerator ::cmInstallDirectoryGenerator(std::vector<std::string> const& dirs, const char* dest, @@ -50,7 +49,6 @@ cmInstallDirectoryGenerator } } -//---------------------------------------------------------------------------- cmInstallDirectoryGenerator ::~cmInstallDirectoryGenerator() { @@ -61,7 +59,6 @@ void cmInstallDirectoryGenerator::Compute(cmLocalGenerator* lg) LocalGenerator = lg; } -//---------------------------------------------------------------------------- void cmInstallDirectoryGenerator::GenerateScriptActions(std::ostream& os, Indent const& indent) @@ -112,7 +109,6 @@ void cmInstallDirectoryGenerator::AddDirectoryInstallRule( indent); } -//---------------------------------------------------------------------------- std::string cmInstallDirectoryGenerator::GetDestination(std::string const& config) const { diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 0b623c6..d77e14f 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -25,7 +25,6 @@ #include "cmExportInstallFileGenerator.h" #include "cmExportSet.h" -//---------------------------------------------------------------------------- cmInstallExportGenerator::cmInstallExportGenerator( cmExportSet* exportSet, const char* destination, @@ -49,7 +48,6 @@ cmInstallExportGenerator::cmInstallExportGenerator( exportSet->AddInstallation(this); } -//---------------------------------------------------------------------------- cmInstallExportGenerator::~cmInstallExportGenerator() { delete this->EFGen; @@ -61,7 +59,6 @@ void cmInstallExportGenerator::Compute(cmLocalGenerator* lg) this->ExportSet->Compute(lg); } -//---------------------------------------------------------------------------- void cmInstallExportGenerator::ComputeTempDir() { // Choose a temporary directory in which to generate the import @@ -123,7 +120,6 @@ void cmInstallExportGenerator::ComputeTempDir() } } -//---------------------------------------------------------------------------- void cmInstallExportGenerator::GenerateScript(std::ostream& os) { // Skip empty sets. @@ -175,7 +171,6 @@ void cmInstallExportGenerator::GenerateScript(std::ostream& os) this->cmInstallGenerator::GenerateScript(os); } -//---------------------------------------------------------------------------- void cmInstallExportGenerator::GenerateScriptConfigs(std::ostream& os, Indent const& indent) @@ -202,7 +197,6 @@ cmInstallExportGenerator::GenerateScriptConfigs(std::ostream& os, } } -//---------------------------------------------------------------------------- void cmInstallExportGenerator::GenerateScriptActions(std::ostream& os, Indent const& indent) { diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index 9703562..a61c38e 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -16,7 +16,6 @@ #include "cmMakefile.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------------- cmInstallFilesGenerator ::cmInstallFilesGenerator(std::vector<std::string> const& files, const char* dest, bool programs, @@ -53,7 +52,6 @@ cmInstallFilesGenerator } } -//---------------------------------------------------------------------------- cmInstallFilesGenerator ::~cmInstallFilesGenerator() { @@ -64,7 +62,6 @@ void cmInstallFilesGenerator::Compute(cmLocalGenerator* lg) this->LocalGenerator = lg; } -//---------------------------------------------------------------------------- std::string cmInstallFilesGenerator::GetDestination(std::string const& config) const { @@ -73,7 +70,6 @@ cmInstallFilesGenerator::GetDestination(std::string const& config) const ->Evaluate(this->LocalGenerator, config); } -//---------------------------------------------------------------------------- void cmInstallFilesGenerator::AddFilesInstallRule( std::ostream& os, const std::string config, @@ -93,7 +89,6 @@ void cmInstallFilesGenerator::AddFilesInstallRule( this->Rename.c_str(), 0, indent); } -//---------------------------------------------------------------------------- void cmInstallFilesGenerator::GenerateScriptActions(std::ostream& os, Indent const& indent) { @@ -107,7 +102,6 @@ void cmInstallFilesGenerator::GenerateScriptActions(std::ostream& os, } } -//---------------------------------------------------------------------------- void cmInstallFilesGenerator::GenerateScriptForConfig(std::ostream& os, const std::string& config, Indent const& indent) diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 660e44f..4218011 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -14,7 +14,6 @@ #include "cmMakefile.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------------- cmInstallGenerator ::cmInstallGenerator(const char* destination, std::vector<std::string> const& configurations, @@ -29,13 +28,11 @@ cmInstallGenerator { } -//---------------------------------------------------------------------------- cmInstallGenerator ::~cmInstallGenerator() { } -//---------------------------------------------------------------------------- void cmInstallGenerator ::AddInstallRule( std::ostream& os, @@ -146,7 +143,6 @@ void cmInstallGenerator os << ")\n"; } -//---------------------------------------------------------------------------- std::string cmInstallGenerator::CreateComponentTest(const char* component, bool exclude_from_all) @@ -161,7 +157,6 @@ cmInstallGenerator::CreateComponentTest(const char* component, return result; } -//---------------------------------------------------------------------------- void cmInstallGenerator::GenerateScript(std::ostream& os) { // Track indentation. @@ -179,13 +174,11 @@ void cmInstallGenerator::GenerateScript(std::ostream& os) os << indent << "endif()\n\n"; } -//---------------------------------------------------------------------------- bool cmInstallGenerator::InstallsForConfig(const std::string& config) { return this->GeneratesForConfig(config); } -//---------------------------------------------------------------------------- std::string cmInstallGenerator::ConvertToAbsoluteDestination(std::string const& dest) const { @@ -199,7 +192,6 @@ cmInstallGenerator::ConvertToAbsoluteDestination(std::string const& dest) const return result; } -//---------------------------------------------------------------------------- cmInstallGenerator::MessageLevel cmInstallGenerator::SelectMessageLevel(cmMakefile* mf, bool never) { diff --git a/Source/cmInstallScriptGenerator.cxx b/Source/cmInstallScriptGenerator.cxx index d58d039..c676569 100644 --- a/Source/cmInstallScriptGenerator.cxx +++ b/Source/cmInstallScriptGenerator.cxx @@ -11,7 +11,6 @@ ============================================================================*/ #include "cmInstallScriptGenerator.h" -//---------------------------------------------------------------------------- cmInstallScriptGenerator ::cmInstallScriptGenerator(const char* script, bool code, const char* component, bool exclude_from_all) : @@ -21,13 +20,11 @@ cmInstallScriptGenerator { } -//---------------------------------------------------------------------------- cmInstallScriptGenerator ::~cmInstallScriptGenerator() { } -//---------------------------------------------------------------------------- void cmInstallScriptGenerator::GenerateScript(std::ostream& os) { Indent indent; diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 971cc23..7e5817e 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -22,7 +22,6 @@ #include <assert.h> -//---------------------------------------------------------------------------- cmInstallTargetGenerator ::cmInstallTargetGenerator(const std::string& targetName, const char* dest, bool implib, @@ -44,13 +43,11 @@ cmInstallTargetGenerator this->NamelinkMode = NamelinkModeNone; } -//---------------------------------------------------------------------------- cmInstallTargetGenerator ::~cmInstallTargetGenerator() { } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator::GenerateScript(std::ostream& os) { // Warn if installing an exclude-from-all target. @@ -68,7 +65,6 @@ void cmInstallTargetGenerator::GenerateScript(std::ostream& os) this->cmInstallGenerator::GenerateScript(os); } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os, const std::string& config, Indent const& indent) @@ -352,7 +348,6 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os, &cmInstallTargetGenerator::PostReplacementTweaks); } -//---------------------------------------------------------------------------- std::string cmInstallTargetGenerator::GetDestination(std::string const& config) const { @@ -361,7 +356,6 @@ cmInstallTargetGenerator::GetDestination(std::string const& config) const ->Evaluate(this->Target->GetLocalGenerator(), config); } -//---------------------------------------------------------------------------- std::string cmInstallTargetGenerator::GetInstallFilename(const std::string& config) const { @@ -371,7 +365,6 @@ cmInstallTargetGenerator::GetInstallFilename(const std::string& config) const nameType); } -//---------------------------------------------------------------------------- std::string cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target, const std::string& config, @@ -451,7 +444,6 @@ void cmInstallTargetGenerator::Compute(cmLocalGenerator* lg) this->Target = lg->FindLocalNonAliasGeneratorTarget(this->TargetName); } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator ::AddTweak(std::ostream& os, Indent const& indent, const std::string& config, @@ -469,7 +461,6 @@ cmInstallTargetGenerator } } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator ::AddTweak(std::ostream& os, Indent const& indent, const std::string& config, @@ -502,7 +493,6 @@ cmInstallTargetGenerator } } -//---------------------------------------------------------------------------- std::string cmInstallTargetGenerator::GetDestDirPath(std::string const& file) { // Construct the path of the file on disk after installation on @@ -516,7 +506,6 @@ std::string cmInstallTargetGenerator::GetDestDirPath(std::string const& file) return toDestDirPath; } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator::PreReplacementTweaks(std::ostream& os, Indent const& indent, const std::string& config, @@ -525,7 +514,6 @@ void cmInstallTargetGenerator::PreReplacementTweaks(std::ostream& os, this->AddRPathCheckRule(os, indent, config, file); } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator::PostReplacementTweaks(std::ostream& os, Indent const& indent, const std::string& config, @@ -538,7 +526,6 @@ void cmInstallTargetGenerator::PostReplacementTweaks(std::ostream& os, this->AddStripRule(os, indent, file); } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator ::AddInstallNamePatchRule(std::ostream& os, Indent const& indent, @@ -652,7 +639,6 @@ cmInstallTargetGenerator } } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator ::AddRPathCheckRule(std::ostream& os, Indent const& indent, @@ -692,7 +678,6 @@ cmInstallTargetGenerator /* clang-format on */ } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator ::AddChrpathPatchRule(std::ostream& os, Indent const& indent, @@ -802,7 +787,6 @@ cmInstallTargetGenerator } } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator::AddStripRule(std::ostream& os, Indent const& indent, @@ -835,7 +819,6 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os, os << indent << "endif()\n"; } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator::AddRanlibRule(std::ostream& os, Indent const& indent, @@ -865,7 +848,6 @@ cmInstallTargetGenerator::AddRanlibRule(std::ostream& os, << ranlib << "\" \"" << toDestDirPath << "\")\n"; } -//---------------------------------------------------------------------------- void cmInstallTargetGenerator ::AddUniversalInstallRule(std::ostream& os, diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx index c5ac9eb..3dac750 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -15,14 +15,12 @@ #include "cmMakefile.h" #include "cmSystemTools.h" -//---------------------------------------------------------------------------- cmInstalledFile::cmInstalledFile(): NameExpression(0) { } -//---------------------------------------------------------------------------- cmInstalledFile::~cmInstalledFile() { if(NameExpression) @@ -41,7 +39,6 @@ cmInstalledFile::Property::~Property() cmDeleteAll(this->ValueExpressions); } -//---------------------------------------------------------------------------- void cmInstalledFile::SetName(cmMakefile* mf, const std::string& name) { cmListFileBacktrace backtrace = mf->GetBacktrace(); @@ -51,25 +48,21 @@ void cmInstalledFile::SetName(cmMakefile* mf, const std::string& name) this->NameExpression = ge.Parse(name).release(); } -//---------------------------------------------------------------------------- std::string const& cmInstalledFile::GetName() const { return this->Name; } -//---------------------------------------------------------------------------- cmCompiledGeneratorExpression const& cmInstalledFile::GetNameExpression() const { return *(this->NameExpression); } -//---------------------------------------------------------------------------- void cmInstalledFile::RemoveProperty(const std::string& prop) { this->Properties.erase(prop); } -//---------------------------------------------------------------------------- void cmInstalledFile::SetProperty(cmMakefile const* mf, const std::string& prop, const char* value) { @@ -77,7 +70,6 @@ void cmInstalledFile::SetProperty(cmMakefile const* mf, this->AppendProperty(mf, prop, value); } -//---------------------------------------------------------------------------- void cmInstalledFile::AppendProperty(cmMakefile const* mf, const std::string& prop, const char* value, bool /*asString*/) { @@ -88,14 +80,12 @@ void cmInstalledFile::AppendProperty(cmMakefile const* mf, property.ValueExpressions.push_back(ge.Parse(value).release()); } -//---------------------------------------------------------------------------- bool cmInstalledFile::HasProperty( const std::string& prop) const { return this->Properties.find(prop) != this->Properties.end(); } -//---------------------------------------------------------------------------- bool cmInstalledFile::GetProperty( const std::string& prop, std::string& value) const { @@ -123,7 +113,6 @@ bool cmInstalledFile::GetProperty( return true; } -//---------------------------------------------------------------------------- bool cmInstalledFile::GetPropertyAsBool(const std::string& prop) const { std::string value; @@ -131,7 +120,6 @@ bool cmInstalledFile::GetPropertyAsBool(const std::string& prop) const return isSet && cmSystemTools::IsOn(value.c_str()); } -//---------------------------------------------------------------------------- void cmInstalledFile::GetPropertyAsList(const std::string& prop, std::vector<std::string>& list) const { diff --git a/Source/cmLinkDirectoriesCommand.cxx b/Source/cmLinkDirectoriesCommand.cxx index b879de6..b77c3be 100644 --- a/Source/cmLinkDirectoriesCommand.cxx +++ b/Source/cmLinkDirectoriesCommand.cxx @@ -28,7 +28,6 @@ bool cmLinkDirectoriesCommand return true; } -//---------------------------------------------------------------------------- void cmLinkDirectoriesCommand::AddLinkDir(std::string const& dir) { std::string unixPath = dir; diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 05be9e5..feecb1e 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -19,7 +19,6 @@ #include <assert.h> #include <ctype.h> #include <stdlib.h> // required for atoi -//---------------------------------------------------------------------------- bool cmListCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -80,7 +79,6 @@ bool cmListCommand return false; } -//---------------------------------------------------------------------------- bool cmListCommand::GetListString(std::string& listString, const std::string& var) { @@ -95,7 +93,6 @@ bool cmListCommand::GetListString(std::string& listString, return true; } -//---------------------------------------------------------------------------- bool cmListCommand::GetList(std::vector<std::string>& list, const std::string& var) { @@ -155,7 +152,6 @@ bool cmListCommand::GetList(std::vector<std::string>& list, return true; } -//---------------------------------------------------------------------------- bool cmListCommand::HandleLengthCommand(std::vector<std::string> const& args) { if(args.size() != 3) @@ -179,7 +175,6 @@ bool cmListCommand::HandleLengthCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args) { if(args.size() < 4) @@ -233,7 +228,6 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args) { assert(args.size() >= 2); @@ -259,7 +253,6 @@ bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmListCommand::HandleFindCommand(std::vector<std::string> const& args) { if(args.size() != 4) @@ -292,7 +285,6 @@ bool cmListCommand::HandleFindCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmListCommand::HandleInsertCommand(std::vector<std::string> const& args) { if(args.size() < 4) @@ -341,7 +333,6 @@ bool cmListCommand::HandleInsertCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmListCommand ::HandleRemoveItemCommand(std::vector<std::string> const& args) { @@ -374,7 +365,6 @@ bool cmListCommand return true; } -//---------------------------------------------------------------------------- bool cmListCommand ::HandleReverseCommand(std::vector<std::string> const& args) { @@ -401,7 +391,6 @@ bool cmListCommand return true; } -//---------------------------------------------------------------------------- bool cmListCommand ::HandleRemoveDuplicatesCommand(std::vector<std::string> const& args) { @@ -433,7 +422,6 @@ bool cmListCommand return true; } -//---------------------------------------------------------------------------- bool cmListCommand ::HandleSortCommand(std::vector<std::string> const& args) { @@ -461,7 +449,6 @@ bool cmListCommand return true; } -//---------------------------------------------------------------------------- bool cmListCommand::HandleRemoveAtCommand( std::vector<std::string> const& args) { @@ -523,7 +510,6 @@ bool cmListCommand::HandleRemoveAtCommand( return true; } -//---------------------------------------------------------------------------- bool cmListCommand::HandleFilterCommand( std::vector<std::string> const& args) { @@ -586,7 +572,6 @@ bool cmListCommand::HandleFilterCommand( return false; } -//---------------------------------------------------------------------------- class MatchesRegex { public: MatchesRegex(cmsys::RegularExpression& in_regex, bool in_includeMatches) diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 0efe099..8788e41 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -20,7 +20,6 @@ #include <cmsys/RegularExpression.hxx> -//---------------------------------------------------------------------------- struct cmListFileParser { cmListFileParser(cmListFile* lf, cmMakefile* mf, const char* filename); @@ -37,7 +36,6 @@ struct cmListFileParser enum { SeparationOkay, SeparationWarning, SeparationError} Separation; }; -//---------------------------------------------------------------------------- cmListFileParser::cmListFileParser(cmListFile* lf, cmMakefile* mf, const char* filename): ListFile(lf), Makefile(mf), FileName(filename), @@ -45,13 +43,11 @@ cmListFileParser::cmListFileParser(cmListFile* lf, cmMakefile* mf, { } -//---------------------------------------------------------------------------- cmListFileParser::~cmListFileParser() { cmListFileLexer_Delete(this->Lexer); } -//---------------------------------------------------------------------------- bool cmListFileParser::ParseFile() { // Open the file. @@ -134,7 +130,6 @@ bool cmListFileParser::ParseFile() return true; } -//---------------------------------------------------------------------------- bool cmListFile::ParseFile(const char* filename, bool topLevel, cmMakefile *mf) @@ -246,7 +241,6 @@ bool cmListFile::ParseFile(const char* filename, return true; } -//---------------------------------------------------------------------------- bool cmListFileParser::ParseFunction(const char* name, long line) { // Ininitialize a new function call. @@ -371,7 +365,6 @@ bool cmListFileParser::ParseFunction(const char* name, long line) return false; } -//---------------------------------------------------------------------------- bool cmListFileParser::AddArgument(cmListFileLexer_Token* token, cmListFileArgument::Delimiter delim) { @@ -572,7 +565,6 @@ void cmListFileBacktrace::PrintCallStack(std::ostream& out) const } } -//---------------------------------------------------------------------------- std::ostream& operator<<(std::ostream& os, cmListFileContext const& lfc) { os << lfc.FilePath; diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx index 63fc00c..4865e56 100644 --- a/Source/cmLoadCacheCommand.cxx +++ b/Source/cmLoadCacheCommand.cxx @@ -89,7 +89,6 @@ bool cmLoadCacheCommand return true; } -//---------------------------------------------------------------------------- bool cmLoadCacheCommand::ReadWithPrefix(std::vector<std::string> const& args) { // Make sure we have a prefix. @@ -166,7 +165,6 @@ bool cmLoadCacheCommand::ReadWithPrefix(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- void cmLoadCacheCommand::CheckLine(const char* line) { // Check one line of the cache file. diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 18b3ef3..8d985b1 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -72,7 +72,6 @@ void cmLocalGenerator::IssueMessage(cmake::MessageType t, this->Makefile->IssueMessage(t, text); } -//---------------------------------------------------------------------------- void cmLocalGenerator::ComputeObjectMaxPath() { // Choose a maximum object file name length. @@ -247,7 +246,6 @@ void cmLocalGenerator::ProcessEvaluationFiles( } } -//---------------------------------------------------------------------------- void cmLocalGenerator::GenerateInstallRules() { // Compute the install prefix. @@ -497,7 +495,6 @@ cmGeneratorTarget* cmLocalGenerator::FindLocalNonAliasGeneratorTarget( return 0; } -//---------------------------------------------------------------------------- void cmLocalGenerator::ComputeTargetManifest() { // Collect the set of configuration types. @@ -962,7 +959,6 @@ cmLocalGenerator::ExpandRuleVariables(std::string& s, s = expandedInput; } -//---------------------------------------------------------------------------- const char* cmLocalGenerator::GetRuleLauncher(cmGeneratorTarget* target, const std::string& prop) { @@ -976,7 +972,6 @@ const char* cmLocalGenerator::GetRuleLauncher(cmGeneratorTarget* target, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::InsertRuleLauncher(std::string& s, cmGeneratorTarget* target, const std::string& prop) @@ -989,7 +984,6 @@ void cmLocalGenerator::InsertRuleLauncher(std::string& s, } } -//---------------------------------------------------------------------------- std::string cmLocalGenerator::ConvertToIncludeReference(std::string const& path, OutputFormat format, @@ -999,7 +993,6 @@ cmLocalGenerator::ConvertToIncludeReference(std::string const& path, path, forceFullPaths? FULL : START_OUTPUT, format); } -//---------------------------------------------------------------------------- std::string cmLocalGenerator::GetIncludeFlags( const std::vector<std::string> &includes, cmGeneratorTarget* target, @@ -1129,7 +1122,6 @@ std::string cmLocalGenerator::GetIncludeFlags( return flags; } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines, cmGeneratorTarget const* target, const std::string& config, @@ -1140,7 +1132,6 @@ void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines, this->AppendDefines(defines, targetDefines); } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddCompileOptions( std::string& flags, cmGeneratorTarget* target, const std::string& lang, const std::string& config @@ -1225,7 +1216,6 @@ void cmLocalGenerator::AddCompileOptions( this->AddCompilerRequirementFlag(flags, target, lang); } -//---------------------------------------------------------------------------- void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, cmGeneratorTarget const* target, const std::string& lang, @@ -1745,7 +1735,6 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries, } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddArchitectureFlags(std::string& flags, cmGeneratorTarget const* target, const std::string& lang, @@ -1803,7 +1792,6 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags, } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddLanguageFlags(std::string& flags, const std::string& lang, const std::string& config) @@ -1815,7 +1803,6 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags, this->AddConfigVariableFlags(flags, flagsVar, config); } -//---------------------------------------------------------------------------- cmGeneratorTarget* cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const { @@ -1836,7 +1823,6 @@ cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const return this->GetGlobalGenerator()->FindGeneratorTarget(name); } -//---------------------------------------------------------------------------- bool cmLocalGenerator::GetRealDependency(const std::string& inName, const std::string& config, std::string& dep) @@ -1937,7 +1923,6 @@ bool cmLocalGenerator::GetRealDependency(const std::string& inName, return true; } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddSharedFlags(std::string& flags, const std::string& lang, bool shared) @@ -1954,7 +1939,6 @@ void cmLocalGenerator::AddSharedFlags(std::string& flags, } } -//---------------------------------------------------------------------------- void cmLocalGenerator:: AddCompilerRequirementFlag(std::string &flags, cmGeneratorTarget const* target, @@ -2147,7 +2131,6 @@ static void AddInlineVisibilityCompileOption(std::string &flags, lg->AppendFlags(flags, opt); } -//---------------------------------------------------------------------------- void cmLocalGenerator ::AddVisibilityPresetFlags(std::string &flags, cmGeneratorTarget const* target, const std::string& lang) @@ -2201,7 +2184,6 @@ void cmLocalGenerator } } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddCMP0018Flags(std::string &flags, cmGeneratorTarget const* target, std::string const& lang, @@ -2240,7 +2222,6 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags, } } -//---------------------------------------------------------------------------- bool cmLocalGenerator::GetShouldUseOldFlags(bool shared, const std::string &lang) const { @@ -2283,7 +2264,6 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared, return false; } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddPositionIndependentFlags(std::string& flags, std::string const& lang, int targetType) @@ -2316,7 +2296,6 @@ void cmLocalGenerator::AddPositionIndependentFlags(std::string& flags, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::AddConfigVariableFlags(std::string& flags, const std::string& var, const std::string& config) @@ -2333,7 +2312,6 @@ void cmLocalGenerator::AddConfigVariableFlags(std::string& flags, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::AppendFlags(std::string& flags, const std::string& newFlags) { @@ -2347,7 +2325,6 @@ void cmLocalGenerator::AppendFlags(std::string& flags, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::AppendFlags(std::string& flags, const char* newFlags) { @@ -2357,14 +2334,12 @@ void cmLocalGenerator::AppendFlags(std::string& flags, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::AppendFlagEscape(std::string& flags, const std::string& rawFlag) { this->AppendFlags(flags, this->EscapeForShell(rawFlag)); } -//---------------------------------------------------------------------------- void cmLocalGenerator::AppendDefines(std::set<std::string>& defines, const char* defines_list) { @@ -2380,7 +2355,6 @@ void cmLocalGenerator::AppendDefines(std::set<std::string>& defines, this->AppendDefines(defines, defines_vec); } -//---------------------------------------------------------------------------- void cmLocalGenerator::AppendDefines(std::set<std::string>& defines, const std::vector<std::string> &defines_vec) { @@ -2396,7 +2370,6 @@ void cmLocalGenerator::AppendDefines(std::set<std::string>& defines, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::JoinDefines(const std::set<std::string>& defines, std::string &definesString, const std::string& lang) @@ -2461,7 +2434,6 @@ void cmLocalGenerator::JoinDefines(const std::set<std::string>& defines, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::AppendFeatureOptions( std::string& flags, const std::string& lang, const char* feature) { @@ -2481,7 +2453,6 @@ void cmLocalGenerator::AppendFeatureOptions( } } -//---------------------------------------------------------------------------- const char* cmLocalGenerator::GetFeature(const std::string& feature, const std::string& config) { @@ -2510,7 +2481,6 @@ std::string cmLocalGenerator::GetProjectName() const return this->StateSnapshot.GetProjectName(); } -//---------------------------------------------------------------------------- std::string cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg, const char* default_comment) @@ -2541,7 +2511,6 @@ cmLocalGenerator::ConstructComment(cmCustomCommandGenerator const& ccg, return default_comment; } -//---------------------------------------------------------------------------- class cmInstallTargetGeneratorLocal: public cmInstallTargetGenerator { public: @@ -2556,7 +2525,6 @@ public: } }; -//---------------------------------------------------------------------------- void cmLocalGenerator ::GenerateTargetInstallRules( @@ -2708,7 +2676,6 @@ bool cmLocalGeneratorCheckObjectName(std::string& objName, } #endif -//---------------------------------------------------------------------------- std::string& cmLocalGenerator ::CreateSafeUniqueObjectFileName(const std::string& sin, @@ -2804,7 +2771,6 @@ cmLocalGenerator return it->second; } -//---------------------------------------------------------------------------- void cmLocalGenerator::ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>&, cmGeneratorTarget const*) @@ -2832,7 +2798,6 @@ bool cmLocalGenerator::IsNMake() const return this->GetState()->UseNMake(); } -//---------------------------------------------------------------------------- std::string cmLocalGenerator ::GetObjectFileNameWithoutTarget(const cmSourceFile& source, @@ -2931,7 +2896,6 @@ cmLocalGenerator return this->CreateSafeUniqueObjectFileName(objectName, dir_max); } -//---------------------------------------------------------------------------- std::string cmLocalGenerator ::GetSourceFileLanguage(const cmSourceFile& source) @@ -2964,7 +2928,6 @@ const char* cmLocalGenerator::GetCurrentSourceDirectory() const return this->StateSnapshot.GetDirectory().GetCurrentSource(); } -//---------------------------------------------------------------------------- std::string cmLocalGenerator::GetTargetDirectory(const cmGeneratorTarget*) const { @@ -2973,7 +2936,6 @@ cmLocalGenerator::GetTargetDirectory(const cmGeneratorTarget*) const return ""; } -//---------------------------------------------------------------------------- KWIML_INT_uint64_t cmLocalGenerator::GetBackwardsCompatibility() { // The computed version may change until the project is fully @@ -3000,7 +2962,6 @@ KWIML_INT_uint64_t cmLocalGenerator::GetBackwardsCompatibility() return this->BackwardsCompatibility; } -//---------------------------------------------------------------------------- bool cmLocalGenerator::NeedBackwardsCompatibility_2_4() { // Check the policy to decide whether to pay attention to this @@ -3038,7 +2999,6 @@ cmLocalGenerator::GetPolicyStatus(cmPolicies::PolicyID id) const return this->Makefile->GetPolicyStatus(id); } -//---------------------------------------------------------------------------- bool cmLocalGenerator::CheckDefinition(std::string const& define) const { // Many compilers do not support -DNAME(arg)=sdf so we disable it. @@ -3079,7 +3039,6 @@ bool cmLocalGenerator::CheckDefinition(std::string const& define) const return true; } -//---------------------------------------------------------------------------- static void cmLGInfoProp(cmMakefile* mf, cmGeneratorTarget* target, const std::string& prop) { @@ -3089,7 +3048,6 @@ static void cmLGInfoProp(cmMakefile* mf, cmGeneratorTarget* target, } } -//---------------------------------------------------------------------------- void cmLocalGenerator::GenerateAppleInfoPList(cmGeneratorTarget* target, const std::string& targetName, const char* fname) @@ -3132,7 +3090,6 @@ void cmLocalGenerator::GenerateAppleInfoPList(cmGeneratorTarget* target, mf->ConfigureFile(inFile.c_str(), fname, false, false, false); } -//---------------------------------------------------------------------------- void cmLocalGenerator::GenerateFrameworkInfoPList(cmGeneratorTarget* target, const std::string& targetName, const char* fname) diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index c26065c..800c071 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -31,7 +31,6 @@ cmLocalNinjaGenerator::cmLocalNinjaGenerator(cmGlobalGenerator* gg, this->TargetImplib = "$TARGET_IMPLIB"; } -//---------------------------------------------------------------------------- // Virtual public methods. cmLocalNinjaGenerator::~cmLocalNinjaGenerator() @@ -112,7 +111,6 @@ std::string cmLocalNinjaGenerator return dir; } -//---------------------------------------------------------------------------- // Non-virtual public methods. const cmGlobalNinjaGenerator* @@ -127,7 +125,6 @@ cmGlobalNinjaGenerator* cmLocalNinjaGenerator::GetGlobalNinjaGenerator() return static_cast<cmGlobalNinjaGenerator*>(this->GetGlobalGenerator()); } -//---------------------------------------------------------------------------- // Virtual protected methods. std::string @@ -145,7 +142,6 @@ cmLocalNinjaGenerator::ConvertToIncludeReference(std::string const& path, return this->Convert(path, forceFullPaths? FULL : HOME_OUTPUT, format); } -//---------------------------------------------------------------------------- // Private methods. cmGeneratedFileStream& cmLocalNinjaGenerator::GetBuildFileStream() const @@ -257,7 +253,6 @@ void cmLocalNinjaGenerator::WriteNinjaFilesInclusion(std::ostream& os) os << "\n"; } -//---------------------------------------------------------------------------- void cmLocalNinjaGenerator::ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, cmGeneratorTarget const* gt) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 7a404af..82220be 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -36,7 +36,6 @@ #include <algorithm> #include <queue> -//---------------------------------------------------------------------------- // Escape special characters in Makefile dependency lines class cmMakeSafe { @@ -60,7 +59,6 @@ private: } }; -//---------------------------------------------------------------------------- // Helper function used below. static std::string cmSplitExtension(std::string const& in, std::string& base) { @@ -79,7 +77,6 @@ static std::string cmSplitExtension(std::string const& in, std::string& base) return ext; } -//---------------------------------------------------------------------------- cmLocalUnixMakefileGenerator3:: cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg, cmMakefile* mf) : cmLocalCommonGenerator(gg, mf) @@ -92,12 +89,10 @@ cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg, cmMakefile* mf) this->BorlandMakeCurlyHack = false; } -//---------------------------------------------------------------------------- cmLocalUnixMakefileGenerator3::~cmLocalUnixMakefileGenerator3() { } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::Generate() { this->SetConfigName(); @@ -156,7 +151,6 @@ void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath() } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, cmGeneratorTarget const* gt) @@ -170,7 +164,6 @@ void cmLocalUnixMakefileGenerator3::ComputeObjectFilenames( } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3:: GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles) { @@ -213,7 +206,6 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles) } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::GetIndividualFileTargets (std::vector<std::string>& targets) { @@ -239,7 +231,6 @@ void cmLocalUnixMakefileGenerator3::GetIndividualFileTargets } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::WriteLocalMakefile() { // generate the includes @@ -350,7 +341,6 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile() this->WriteSpecialTargetsBottom(ruleFileStream); } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteObjectConvenienceRule(std::ostream& ruleFileStream, @@ -407,7 +397,6 @@ cmLocalUnixMakefileGenerator3 output, no_depends, commands, true, inHelp); } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteLocalMakefileTargets(std::ostream& ruleFileStream, std::set<std::string> &emitted) @@ -500,7 +489,6 @@ void cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile() { std::string infoFileName = this->GetCurrentBinaryDirectory(); @@ -566,7 +554,6 @@ void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile() "${CMAKE_C_INCLUDE_REGEX_COMPLAIN})\n"; } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 ::ConvertToFullPath(const std::string& localPath) @@ -583,7 +570,6 @@ const std::string &cmLocalUnixMakefileGenerator3::GetHomeRelativeOutputPath() return this->HomeRelativeOutputPath; } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteMakeRule(std::ostream& os, @@ -672,7 +658,6 @@ cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 ::ConvertShellCommand(std::string const& cmd, RelativeRoot root) @@ -693,7 +678,6 @@ cmLocalUnixMakefileGenerator3 return this->Convert(cmd, root, SHELL); } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteMakeVariables(std::ostream& makefileStream) @@ -763,7 +747,6 @@ cmLocalUnixMakefileGenerator3 /* clang-format on */ } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteSpecialTargetsTop(std::ostream& makefileStream) @@ -870,7 +853,6 @@ cmLocalUnixMakefileGenerator3 this->WriteMakeVariables(makefileStream); } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteSpecialTargetsBottom(std::ostream& makefileStream) { @@ -914,7 +896,6 @@ void cmLocalUnixMakefileGenerator3 -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteConvenienceRule(std::ostream& ruleFileStream, @@ -938,7 +919,6 @@ cmLocalUnixMakefileGenerator3 } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 ::GetRelativeTargetDirectory(cmGeneratorTarget* target) @@ -950,7 +930,6 @@ cmLocalUnixMakefileGenerator3 -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags, const std::string& newFlags) { @@ -967,14 +946,12 @@ void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags, this->cmLocalGenerator::AppendFlags(flags, newFlags); } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags, const char* newFlags) { this->cmLocalGenerator::AppendFlags(flags, newFlags); } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendRuleDepend(std::vector<std::string>& depends, @@ -990,7 +967,6 @@ cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendRuleDepends(std::vector<std::string>& depends, @@ -1004,7 +980,6 @@ cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendCustomDepends(std::vector<std::string>& depends, @@ -1018,7 +993,6 @@ cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendCustomDepend(std::vector<std::string>& depends, @@ -1037,7 +1011,6 @@ cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendCustomCommands(std::vector<std::string>& commands, @@ -1053,7 +1026,6 @@ cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendCustomCommand(std::vector<std::string>& commands, @@ -1185,7 +1157,6 @@ cmLocalUnixMakefileGenerator3 commands.insert(commands.end(), commands1.begin(), commands1.end()); } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3::MakeLauncher( cmCustomCommandGenerator const& ccg, @@ -1221,7 +1192,6 @@ cmLocalUnixMakefileGenerator3::MakeLauncher( return launcher; } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::AppendCleanCommand(std::vector<std::string>& commands, @@ -1277,7 +1247,6 @@ cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands, std::string const& text, @@ -1371,7 +1340,6 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands, } } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 ::CreateMakeVariable(const std::string& sin, const std::string& s2in) @@ -1463,7 +1431,6 @@ cmLocalUnixMakefileGenerator3 return ret; } -//---------------------------------------------------------------------------- bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo, bool verbose, bool color) @@ -1574,7 +1541,6 @@ bool cmLocalUnixMakefileGenerator3::UpdateDependencies(const char* tgtInfo, return true; } -//---------------------------------------------------------------------------- bool cmLocalUnixMakefileGenerator3 ::ScanDependencies(const char* targetDir, @@ -1697,7 +1663,6 @@ cmLocalUnixMakefileGenerator3 return true; } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::CheckMultipleOutputs(bool verbose) { cmMakefile* mf = this->Makefile; @@ -1736,7 +1701,6 @@ void cmLocalUnixMakefileGenerator3::CheckMultipleOutputs(bool verbose) } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteLocalAllRules(std::ostream& ruleFileStream) { @@ -1954,7 +1918,6 @@ void cmLocalUnixMakefileGenerator3 } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::ClearDependencies(cmMakefile* mf, bool verbose) { @@ -2177,7 +2140,6 @@ void cmLocalUnixMakefileGenerator3 } } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::WriteDisclaimer(std::ostream& os) { os @@ -2188,7 +2150,6 @@ void cmLocalUnixMakefileGenerator3::WriteDisclaimer(std::ostream& os) << cmVersion::GetMinorVersion() << "\n\n"; } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 ::GetRecursiveMakeCall(const char *makefile, const std::string& tgt) @@ -2239,7 +2200,6 @@ cmLocalUnixMakefileGenerator3 return cmd; } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::WriteDivider(std::ostream& os) { os @@ -2247,7 +2207,6 @@ void cmLocalUnixMakefileGenerator3::WriteDivider(std::ostream& os) << "=======================================\n"; } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::WriteCMakeArgument(std::ostream& os, const char* s) @@ -2273,7 +2232,6 @@ cmLocalUnixMakefileGenerator3 os << "\""; } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p, bool useWatcomQuote) @@ -2353,7 +2311,6 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p, return result; } -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 ::GetTargetDirectory(cmGeneratorTarget const* target) const @@ -2368,7 +2325,6 @@ cmLocalUnixMakefileGenerator3 return dir; } -//---------------------------------------------------------------------------- cmLocalUnixMakefileGenerator3::ImplicitDependLanguageMap const& cmLocalUnixMakefileGenerator3::GetImplicitDepends( const cmGeneratorTarget* tgt) @@ -2376,7 +2332,6 @@ cmLocalUnixMakefileGenerator3::GetImplicitDepends( return this->ImplicitDepends[tgt->GetName()]; } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3::AddImplicitDepends(const cmGeneratorTarget* tgt, const std::string& lang, @@ -2386,7 +2341,6 @@ cmLocalUnixMakefileGenerator3::AddImplicitDepends(const cmGeneratorTarget* tgt, this->ImplicitDepends[tgt->GetName()][lang][obj].push_back(src); } -//---------------------------------------------------------------------------- void cmLocalUnixMakefileGenerator3 ::CreateCDCommand(std::vector<std::string>& commands, const char *tgtDir, cmLocalGenerator::RelativeRoot relRetDir) diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index 314fa0f..4025df4 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -61,7 +61,6 @@ class cmVS10XMLParser : public cmXMLParser }; -//---------------------------------------------------------------------------- cmLocalVisualStudio10Generator ::cmLocalVisualStudio10Generator(cmGlobalGenerator* gg, cmMakefile* mf): cmLocalVisualStudio7Generator(gg, mf) @@ -123,7 +122,6 @@ void cmLocalVisualStudio10Generator cmState::INTERNAL); } -//---------------------------------------------------------------------------- const char* cmLocalVisualStudio10Generator::ReportErrorLabel() const { return ":VCEnd"; diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 3c01a70..897fce1 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -53,7 +53,6 @@ static void cmConvertToWindowsSlash(std::string& s) } } -//---------------------------------------------------------------------------- cmLocalVisualStudio7Generator ::cmLocalVisualStudio7Generator(cmGlobalGenerator* gg, cmMakefile* mf): cmLocalVisualStudioGenerator(gg, mf) @@ -193,7 +192,6 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles() } } -//---------------------------------------------------------------------------- void cmLocalVisualStudio7Generator::WriteStampFiles() { // Touch a timestamp file used to determine when the project file is @@ -224,7 +222,6 @@ void cmLocalVisualStudio7Generator::WriteStampFiles() } } -//---------------------------------------------------------------------------- void cmLocalVisualStudio7Generator ::CreateSingleVCProj(const std::string& lname, cmGeneratorTarget *target) { @@ -271,7 +268,6 @@ void cmLocalVisualStudio7Generator gg->SetVersion(realVersion); } -//---------------------------------------------------------------------------- cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule() { std::string stampName = this->GetCurrentBinaryDirectory(); @@ -593,7 +589,6 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFortranLinkFlagTable[] = {0,0,0,0,0} }; -//---------------------------------------------------------------------------- // Helper class to write build event <Tool .../> elements. class cmLocalVisualStudio7Generator::EventWriter { @@ -646,7 +641,6 @@ private: bool First; }; -//---------------------------------------------------------------------------- void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, const std::string& configName, const std::string& libName, @@ -1034,7 +1028,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, fout << "\t\t</Configuration>\n"; } -//---------------------------------------------------------------------------- std::string cmLocalVisualStudio7Generator ::GetBuildTypeLinkerFlags(std::string rootLinkerFlags, @@ -1423,7 +1416,6 @@ void cmLocalVisualStudio7Generator::OutputDeploymentDebuggerTool( } } -//---------------------------------------------------------------------------- void cmLocalVisualStudio7Generator ::WriteTargetVersionAttribute(std::ostream& fout, cmGeneratorTarget* gt) @@ -1434,7 +1426,6 @@ cmLocalVisualStudio7Generator fout << "\t\t\t\tVersion=\"" << major << "." << minor << "\"\n"; } -//---------------------------------------------------------------------------- void cmLocalVisualStudio7GeneratorInternals ::OutputLibraries(std::ostream& fout, ItemVector const& libs) @@ -1457,7 +1448,6 @@ cmLocalVisualStudio7GeneratorInternals } } -//---------------------------------------------------------------------------- void cmLocalVisualStudio7GeneratorInternals ::OutputObjects(std::ostream& fout, cmGeneratorTarget* gt, const char* isep) @@ -1479,7 +1469,6 @@ cmLocalVisualStudio7GeneratorInternals } } -//---------------------------------------------------------------------------- void cmLocalVisualStudio7Generator ::OutputLibraryDirectories(std::ostream& fout, @@ -1735,7 +1724,6 @@ cmLocalVisualStudio7GeneratorFCInfo } } -//---------------------------------------------------------------------------- std::string cmLocalVisualStudio7Generator ::ComputeLongestObjectDirectory(cmGeneratorTarget const* target) const @@ -2420,7 +2408,6 @@ void cmLocalVisualStudio7Generator::ReadAndStoreExternalGUID( } -//---------------------------------------------------------------------------- std::string cmLocalVisualStudio7Generator ::GetTargetDirectory(cmGeneratorTarget const* target) const { @@ -2430,7 +2417,6 @@ std::string cmLocalVisualStudio7Generator return dir; } -//---------------------------------------------------------------------------- #include <windows.h> static bool cmLVS7G_IsFAT(const char* dir) { diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index 23e2bfd..b12ea49 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -18,19 +18,16 @@ #include "cmSystemTools.h" #include "windows.h" -//---------------------------------------------------------------------------- cmLocalVisualStudioGenerator ::cmLocalVisualStudioGenerator(cmGlobalGenerator* gg, cmMakefile* mf) : cmLocalGenerator(gg, mf) { } -//---------------------------------------------------------------------------- cmLocalVisualStudioGenerator::~cmLocalVisualStudioGenerator() { } -//---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::VSVersion cmLocalVisualStudioGenerator::GetVersion() const { @@ -39,7 +36,6 @@ cmLocalVisualStudioGenerator::GetVersion() const return gg->GetVersion(); } -//---------------------------------------------------------------------------- void cmLocalVisualStudioGenerator::ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, cmGeneratorTarget const* gt) @@ -79,7 +75,6 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames( } } -//---------------------------------------------------------------------------- cmsys::auto_ptr<cmCustomCommand> cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget* target, const std::string& config, @@ -115,19 +110,16 @@ cmLocalVisualStudioGenerator::MaybeCreateImplibDir(cmGeneratorTarget* target, return pcc; } -//---------------------------------------------------------------------------- const char* cmLocalVisualStudioGenerator::ReportErrorLabel() const { return ":VCReportError"; } -//---------------------------------------------------------------------------- const char* cmLocalVisualStudioGenerator::GetReportErrorLabel() const { return this->ReportErrorLabel(); } -//---------------------------------------------------------------------------- std::string cmLocalVisualStudioGenerator ::ConstructScript(cmCustomCommandGenerator const& ccg, diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx index d563fe7..18eccdd 100644 --- a/Source/cmLocalXCodeGenerator.cxx +++ b/Source/cmLocalXCodeGenerator.cxx @@ -15,7 +15,6 @@ #include "cmMakefile.h" #include "cmSourceFile.h" -//---------------------------------------------------------------------------- cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg, cmMakefile* mf) : cmLocalGenerator(gg, mf) @@ -25,12 +24,10 @@ cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg, this->EmitUniversalBinaryFlags = false; } -//---------------------------------------------------------------------------- cmLocalXCodeGenerator::~cmLocalXCodeGenerator() { } -//---------------------------------------------------------------------------- std::string cmLocalXCodeGenerator::GetTargetDirectory(cmGeneratorTarget const*) const { @@ -38,7 +35,6 @@ cmLocalXCodeGenerator::GetTargetDirectory(cmGeneratorTarget const*) const return ""; } -//---------------------------------------------------------------------------- void cmLocalXCodeGenerator::AppendFlagEscape(std::string& flags, const std::string& rawFlag) { @@ -47,7 +43,6 @@ void cmLocalXCodeGenerator::AppendFlagEscape(std::string& flags, gg->AppendFlag(flags, rawFlag); } -//---------------------------------------------------------------------------- void cmLocalXCodeGenerator::Generate() { cmLocalGenerator::Generate(); @@ -60,7 +55,6 @@ void cmLocalXCodeGenerator::Generate() } } -//---------------------------------------------------------------------------- void cmLocalXCodeGenerator::GenerateInstallRules() { cmLocalGenerator::GenerateInstallRules(); @@ -73,7 +67,6 @@ void cmLocalXCodeGenerator::GenerateInstallRules() } } -//---------------------------------------------------------------------------- void cmLocalXCodeGenerator::ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, cmGeneratorTarget const*) diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx index bb4d4a1..147979d 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -206,7 +206,6 @@ bool cmMachOHeaderAndLoadCommands::read_load_commands(uint32_t ncmds, return true; } -//---------------------------------------------------------------------------- class cmMachOInternal { public: @@ -361,14 +360,12 @@ bool cmMachOInternal::read_mach_o(uint32_t file_offset) //============================================================================ // External class implementation. -//---------------------------------------------------------------------------- cmMachO::cmMachO(const char* fname): Internal(0) { this->Internal = new cmMachOInternal(fname); } -//---------------------------------------------------------------------------- cmMachO::~cmMachO() { delete this->Internal; @@ -379,7 +376,6 @@ std::string const& cmMachO::GetErrorMessage() const return this->Internal->ErrorMessage; } -//---------------------------------------------------------------------------- bool cmMachO::Valid() const { return !this->Internal->MachOList.empty(); diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 53a257c..251d748 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -105,7 +105,6 @@ cmMakefile::~cmMakefile() cmDeleteAll(this->EvaluationFiles); } -//---------------------------------------------------------------------------- void cmMakefile::IssueMessage(cmake::MessageType t, std::string const& text, bool force) const @@ -153,13 +152,11 @@ cmBacktraceRange cmMakefile::GetCompileDefinitionsBacktraces() const .GetCompileDefinitionsEntryBacktraces(); } -//---------------------------------------------------------------------------- cmListFileBacktrace cmMakefile::GetBacktrace() const { return this->Backtrace; } -//---------------------------------------------------------------------------- cmListFileBacktrace cmMakefile::GetBacktrace(cmCommandContext const& cc) const { cmListFileContext lfc; @@ -169,7 +166,6 @@ cmListFileBacktrace cmMakefile::GetBacktrace(cmCommandContext const& cc) const return this->Backtrace.Push(lfc); } -//---------------------------------------------------------------------------- cmListFileContext cmMakefile::GetExecutionContext() const { cmListFileContext const& cur = this->Backtrace.Top(); @@ -180,7 +176,6 @@ cmListFileContext cmMakefile::GetExecutionContext() const return lfc; } -//---------------------------------------------------------------------------- void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const { std::ostringstream msg; @@ -230,7 +225,6 @@ private: cmMakefile* Makefile; }; -//---------------------------------------------------------------------------- bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff, cmExecutionStatus &status) { @@ -315,7 +309,6 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff, return result; } -//---------------------------------------------------------------------------- class cmMakefile::IncludeScope { public: @@ -331,7 +324,6 @@ private: void EnforceCMP0011(); }; -//---------------------------------------------------------------------------- cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf, std::string const& filenametoread, bool noPolicyScope): @@ -377,7 +369,6 @@ cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf, } } -//---------------------------------------------------------------------------- cmMakefile::IncludeScope::~IncludeScope() { if(!this->NoPolicyScope) @@ -409,7 +400,6 @@ cmMakefile::IncludeScope::~IncludeScope() this->Makefile->Backtrace = this->Makefile->Backtrace.Pop(); } -//---------------------------------------------------------------------------- void cmMakefile::IncludeScope::EnforceCMP0011() { // We check the setting of this policy again because the included @@ -573,7 +563,6 @@ void cmMakefile::ReadListFile(cmListFile const& listFile, this->MarkVariableAsUsed("CMAKE_CURRENT_LIST_DIR"); } -//---------------------------------------------------------------------------- void cmMakefile::EnforceDirectoryLevelRules() const { // Diagnose a violation of CMP0000 if necessary. @@ -720,7 +709,6 @@ void cmMakefile::ConfigureFinalPass() } } -//---------------------------------------------------------------------------- void cmMakefile::AddCustomCommandToTarget(const std::string& target, const std::vector<std::string>& byproducts, @@ -828,7 +816,6 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target, } } -//---------------------------------------------------------------------------- cmSourceFile* cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs, const std::vector<std::string>& byproducts, @@ -961,7 +948,6 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs, return file; } -//---------------------------------------------------------------------------- void cmMakefile::UpdateOutputToSourceMap(std::vector<std::string> const& outputs, cmSourceFile* source) @@ -973,7 +959,6 @@ cmMakefile::UpdateOutputToSourceMap(std::vector<std::string> const& outputs, } } -//---------------------------------------------------------------------------- void cmMakefile::UpdateOutputToSourceMap(std::string const& output, cmSourceFile* source) @@ -994,7 +979,6 @@ cmMakefile::UpdateOutputToSourceMap(std::string const& output, this->OutputToSource[output] = source; } -//---------------------------------------------------------------------------- cmSourceFile* cmMakefile::AddCustomCommandToOutput(const std::string& output, const std::vector<std::string>& depends, @@ -1016,7 +1000,6 @@ cmMakefile::AddCustomCommandToOutput(const std::string& output, uses_terminal); } -//---------------------------------------------------------------------------- void cmMakefile::AddCustomCommandOldStyle(const std::string& target, const std::vector<std::string>& outputs, @@ -1087,7 +1070,6 @@ cmMakefile::AddCustomCommandOldStyle(const std::string& target, } } -//---------------------------------------------------------------------------- cmTarget* cmMakefile::AddUtilityCommand(const std::string& utilityName, bool excludeFromAll, @@ -1126,7 +1108,6 @@ cmMakefile::AddUtilityCommand(const std::string& utilityName, depends, commandLines); } -//---------------------------------------------------------------------------- cmTarget* cmMakefile::AddUtilityCommand(const std::string& utilityName, bool excludeFromAll, @@ -1142,7 +1123,6 @@ cmMakefile::AddUtilityCommand(const std::string& utilityName, escapeOldStyle, comment, uses_terminal); } -//---------------------------------------------------------------------------- cmTarget* cmMakefile::AddUtilityCommand(const std::string& utilityName, bool excludeFromAll, @@ -1591,7 +1571,6 @@ private: bool ReportError; }; -//---------------------------------------------------------------------------- void cmMakefile::Configure() { std::string currentStart = @@ -1755,7 +1734,6 @@ std::vector<cmTarget*> cmMakefile::GetImportedTargets() const return tgts; } -//---------------------------------------------------------------------------- void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs, bool before) { @@ -1786,7 +1764,6 @@ void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs, } } -//---------------------------------------------------------------------------- void cmMakefile::AddSystemIncludeDirectories(const std::set<std::string> &incs) { @@ -2070,7 +2047,6 @@ cmTarget* cmMakefile::AddExecutable(const char *exeName, return target; } -//---------------------------------------------------------------------------- cmTarget* cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name) { @@ -3129,7 +3105,6 @@ void cmMakefile::RemoveVariablesInString(std::string& source, } } -//---------------------------------------------------------------------------- std::string cmMakefile::GetConfigurations(std::vector<std::string>& configs, bool singleConfig) const @@ -3218,13 +3193,11 @@ bool cmMakefile::IsFunctionBlocked(const cmListFileFunction& lff, return false; } -//---------------------------------------------------------------------------- void cmMakefile::PushFunctionBlockerBarrier() { this->FunctionBlockerBarriers.push_back(this->FunctionBlockers.size()); } -//---------------------------------------------------------------------------- void cmMakefile::PopFunctionBlockerBarrier(bool reportError) { // Remove any extra entries pushed on the barrier. @@ -3253,7 +3226,6 @@ void cmMakefile::PopFunctionBlockerBarrier(bool reportError) this->FunctionBlockerBarriers.pop_back(); } -//---------------------------------------------------------------------------- void cmMakefile::PushLoopBlock() { assert(!this->LoopBlockCounter.empty()); @@ -3291,7 +3263,6 @@ std::string cmMakefile::GetExecutionFilePath() const return this->StateSnapshot.GetExecutionListFile(); } -//---------------------------------------------------------------------------- bool cmMakefile::ExpandArguments( std::vector<cmListFileArgument> const& inArgs, std::vector<std::string>& outArgs, const char* filename) const @@ -3331,7 +3302,6 @@ bool cmMakefile::ExpandArguments( return !cmSystemTools::GetFatalErrorOccured(); } -//---------------------------------------------------------------------------- bool cmMakefile::ExpandArguments( std::vector<cmListFileArgument> const& inArgs, std::vector<cmExpandedCommandArgument>& outArgs, const char* filename) const @@ -3376,7 +3346,6 @@ bool cmMakefile::ExpandArguments( return !cmSystemTools::GetFatalErrorOccured(); } -//---------------------------------------------------------------------------- void cmMakefile::AddFunctionBlocker(cmFunctionBlocker* fb) { if(!this->ExecutionStatusStack.empty()) @@ -3464,7 +3433,6 @@ void cmMakefile::SetArgcArgv(const std::vector<std::string>& args) } } -//---------------------------------------------------------------------------- cmSourceFile* cmMakefile::GetSource(const std::string& sourceName) const { cmSourceFileLocation sfl(this, sourceName); @@ -3481,7 +3449,6 @@ cmSourceFile* cmMakefile::GetSource(const std::string& sourceName) const return 0; } -//---------------------------------------------------------------------------- cmSourceFile* cmMakefile::CreateSource(const std::string& sourceName, bool generated) { @@ -3494,7 +3461,6 @@ cmSourceFile* cmMakefile::CreateSource(const std::string& sourceName, return sf; } -//---------------------------------------------------------------------------- cmSourceFile* cmMakefile::GetOrCreateSource(const std::string& sourceName, bool generated) { @@ -4025,7 +3991,6 @@ cmTarget* cmMakefile::FindLocalNonAliasTarget(const std::string& name) const return 0; } -//---------------------------------------------------------------------------- cmTest* cmMakefile::CreateTest(const std::string& testName) { cmTest* test = this->GetTest(testName); @@ -4039,7 +4004,6 @@ cmTest* cmMakefile::CreateTest(const std::string& testName) return test; } -//---------------------------------------------------------------------------- cmTest* cmMakefile::GetTest(const std::string& testName) const { std::map<std::string, cmTest*>::const_iterator @@ -4148,7 +4112,6 @@ void cmMakefile::RaiseScope(const std::string& var, const char *varDef) } } -//---------------------------------------------------------------------------- cmTarget* cmMakefile::AddImportedTarget(const std::string& name, cmState::TargetType type, @@ -4169,7 +4132,6 @@ cmMakefile::AddImportedTarget(const std::string& name, return target.release(); } -//---------------------------------------------------------------------------- cmTarget* cmMakefile::FindTargetToUse(const std::string& name, bool excludeAliases) const { @@ -4192,7 +4154,6 @@ cmTarget* cmMakefile::FindTargetToUse(const std::string& name, return this->GetGlobalGenerator()->FindTarget(name, excludeAliases); } -//---------------------------------------------------------------------------- bool cmMakefile::IsAlias(const std::string& name) const { if (this->AliasTargets.find(name) != this->AliasTargets.end()) @@ -4200,7 +4161,6 @@ bool cmMakefile::IsAlias(const std::string& name) const return this->GetGlobalGenerator()->IsAlias(name); } -//---------------------------------------------------------------------------- bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg, bool isCustom) const { @@ -4295,7 +4255,6 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg, return true; } -//---------------------------------------------------------------------------- bool cmMakefile::EnforceUniqueDir(const std::string& srcPath, const std::string& binPath) const { @@ -4348,13 +4307,11 @@ bool cmMakefile::EnforceUniqueDir(const std::string& srcPath, return false; } -//---------------------------------------------------------------------------- void cmMakefile::AddQtUiFileWithOptions(cmSourceFile *sf) { this->QtUiFilesWithOptions.push_back(sf); } -//---------------------------------------------------------------------------- std::vector<cmSourceFile*> cmMakefile::GetQtUiFilesWithOptions() const { return this->QtUiFilesWithOptions; @@ -4375,7 +4332,6 @@ static std::string const matchVariables[] = { static std::string const nMatchesVariable = "CMAKE_MATCH_COUNT"; -//---------------------------------------------------------------------------- void cmMakefile::ClearMatches() { const char* nMatchesStr = this->GetDefinition(nMatchesVariable); @@ -4398,7 +4354,6 @@ void cmMakefile::ClearMatches() this->MarkVariableAsUsed(nMatchesVariable); } -//---------------------------------------------------------------------------- void cmMakefile::StoreMatches(cmsys::RegularExpression& re) { char highest = 0; @@ -4428,14 +4383,12 @@ const char* cmMakefile::GetDefineFlagsCMP0059() const return this->DefineFlagsOrig.c_str(); } -//---------------------------------------------------------------------------- cmPolicies::PolicyStatus cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const { return this->StateSnapshot.GetPolicy(id); } -//---------------------------------------------------------------------------- bool cmMakefile::PolicyOptionalWarningEnabled(std::string const& var) { // Check for an explicit CMAKE_POLICY_WARNING_CMP<NNNN> setting. @@ -4466,7 +4419,6 @@ bool cmMakefile::SetPolicy(const char *id, return this->SetPolicy(pid,status); } -//---------------------------------------------------------------------------- bool cmMakefile::SetPolicy(cmPolicies::PolicyID id, cmPolicies::PolicyStatus status) { @@ -4485,25 +4437,21 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id, return true; } -//---------------------------------------------------------------------------- cmMakefile::PolicyPushPop::PolicyPushPop(cmMakefile* m): Makefile(m) { this->Makefile->PushPolicy(); } -//---------------------------------------------------------------------------- cmMakefile::PolicyPushPop::~PolicyPushPop() { this->Makefile->PopPolicy(); } -//---------------------------------------------------------------------------- void cmMakefile::PushPolicy(bool weak, cmPolicies::PolicyMap const& pm) { this->StateSnapshot.PushPolicy(pm, weak); } -//---------------------------------------------------------------------------- void cmMakefile::PopPolicy() { if (!this->StateSnapshot.PopPolicy()) @@ -4513,7 +4461,6 @@ void cmMakefile::PopPolicy() } } -//---------------------------------------------------------------------------- void cmMakefile::PopSnapshot(bool reportError) { // cmState::Snapshot manages nested policy scopes within it. @@ -4534,20 +4481,17 @@ void cmMakefile::PopSnapshot(bool reportError) assert(this->StateSnapshot.IsValid()); } -//---------------------------------------------------------------------------- bool cmMakefile::SetPolicyVersion(const char *version) { return cmPolicies::ApplyPolicyVersion(this,version); } -//---------------------------------------------------------------------------- bool cmMakefile::HasCMP0054AlreadyBeenReported( cmListFileContext const& context) const { return !this->CMP0054ReportedIds.insert(context).second; } -//---------------------------------------------------------------------------- void cmMakefile::RecordPolicies(cmPolicies::PolicyMap& pm) { /* Record the setting of every policy. */ @@ -4559,7 +4503,6 @@ void cmMakefile::RecordPolicies(cmPolicies::PolicyMap& pm) } } -//---------------------------------------------------------------------------- bool cmMakefile::IgnoreErrorsCMP0061() const { bool ignoreErrors = true; @@ -4578,7 +4521,6 @@ bool cmMakefile::IgnoreErrorsCMP0061() const return ignoreErrors; } -//---------------------------------------------------------------------------- #define FEATURE_STRING(F) , #F static const char * const C_FEATURES[] = { 0 @@ -4602,7 +4544,6 @@ static const char * const CXX_STANDARDS[] = { , "14" }; -//---------------------------------------------------------------------------- bool cmMakefile:: AddRequiredTargetFeature(cmTarget *target, const std::string& feature, std::string *error) const @@ -4648,7 +4589,6 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature, : this->AddRequiredTargetCxxFeature(target, feature); } -//---------------------------------------------------------------------------- bool cmMakefile:: CompileFeatureKnown(cmTarget const* target, const std::string& feature, std::string& lang, std::string *error) const @@ -4693,7 +4633,6 @@ CompileFeatureKnown(cmTarget const* target, const std::string& feature, return false; } -//---------------------------------------------------------------------------- const char* cmMakefile:: CompileFeaturesAvailable(const std::string& lang, std::string *error) const { @@ -4728,7 +4667,6 @@ CompileFeaturesAvailable(const std::string& lang, std::string *error) const return featuresKnown; } -//---------------------------------------------------------------------------- bool cmMakefile::HaveStandardAvailable(cmTarget const* target, std::string const& lang, const std::string& feature) const @@ -4738,7 +4676,6 @@ bool cmMakefile::HaveStandardAvailable(cmTarget const* target, : this->HaveCxxStandardAvailable(target, feature); } -//---------------------------------------------------------------------------- bool cmMakefile:: HaveCStandardAvailable(cmTarget const* target, const std::string& feature) const @@ -4816,7 +4753,6 @@ HaveCStandardAvailable(cmTarget const* target, return true; } -//---------------------------------------------------------------------------- bool cmMakefile::IsLaterStandard(std::string const& lang, std::string const& lhs, std::string const& rhs) @@ -4838,7 +4774,6 @@ bool cmMakefile::IsLaterStandard(std::string const& lang, cmStrCmp(lhs)) != cmArrayEnd(CXX_STANDARDS); } -//---------------------------------------------------------------------------- bool cmMakefile::HaveCxxStandardAvailable(cmTarget const* target, const std::string& feature) const { @@ -4906,7 +4841,6 @@ bool cmMakefile::HaveCxxStandardAvailable(cmTarget const* target, return true; } -//---------------------------------------------------------------------------- void cmMakefile::CheckNeededCxxLanguage(const std::string& feature, bool& needCxx98, bool& needCxx11, @@ -4935,7 +4869,6 @@ void cmMakefile::CheckNeededCxxLanguage(const std::string& feature, } } -//---------------------------------------------------------------------------- bool cmMakefile:: AddRequiredTargetCxxFeature(cmTarget *target, const std::string& feature) const @@ -5006,7 +4939,6 @@ AddRequiredTargetCxxFeature(cmTarget *target, return true; } -//---------------------------------------------------------------------------- void cmMakefile::CheckNeededCLanguage(const std::string& feature, bool& needC90, bool& needC99, @@ -5035,7 +4967,6 @@ void cmMakefile::CheckNeededCLanguage(const std::string& feature, } } -//---------------------------------------------------------------------------- bool cmMakefile:: AddRequiredTargetCFeature(cmTarget *target, const std::string& feature) const { diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 9e35e4c..7e54680 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -18,7 +18,6 @@ #include "cmSourceFile.h" #include "cmake.h" -//---------------------------------------------------------------------------- cmMakefileExecutableTargetGenerator ::cmMakefileExecutableTargetGenerator(cmGeneratorTarget* target): cmMakefileTargetGenerator(target) @@ -33,14 +32,12 @@ cmMakefileExecutableTargetGenerator this->OSXBundleGenerator->SetMacContentFolders(&this->MacContentFolders); } -//---------------------------------------------------------------------------- cmMakefileExecutableTargetGenerator ::~cmMakefileExecutableTargetGenerator() { delete this->OSXBundleGenerator; } -//---------------------------------------------------------------------------- void cmMakefileExecutableTargetGenerator::WriteRuleFiles() { // create the build.make file and directory, put in the common blocks @@ -79,7 +76,6 @@ void cmMakefileExecutableTargetGenerator::WriteRuleFiles() -//---------------------------------------------------------------------------- void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) { std::vector<std::string> commands; diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 9ded69f..195dd98 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -19,7 +19,6 @@ #include "cmSourceFile.h" #include "cmake.h" -//---------------------------------------------------------------------------- cmMakefileLibraryTargetGenerator ::cmMakefileLibraryTargetGenerator(cmGeneratorTarget* target): cmMakefileTargetGenerator(target) @@ -37,14 +36,12 @@ cmMakefileLibraryTargetGenerator this->OSXBundleGenerator->SetMacContentFolders(&this->MacContentFolders); } -//---------------------------------------------------------------------------- cmMakefileLibraryTargetGenerator ::~cmMakefileLibraryTargetGenerator() { delete this->OSXBundleGenerator; } -//---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteRuleFiles() { // create the build.make file and directory, put in the common blocks @@ -105,7 +102,6 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles() this->CloseFileStreams(); } -//---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules() { std::vector<std::string> commands; @@ -129,7 +125,6 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules() this->WriteTargetDriverRule(this->GeneratorTarget->GetName(), false); } -//---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules() { std::string linkLanguage = @@ -150,7 +145,6 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules() this->WriteLibraryRules(linkRuleVar, extraFlags, false); } -//---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink) { if(this->GeneratorTarget->IsFrameworkOnApple()) @@ -179,7 +173,6 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink) this->WriteLibraryRules(linkRuleVar, extraFlags, relink); } -//---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink) { std::string linkLanguage = @@ -202,7 +195,6 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink) this->WriteLibraryRules(linkRuleVar, extraFlags, relink); } -//---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink) { std::string linkLanguage = @@ -224,7 +216,6 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink) this->WriteLibraryRules(linkRuleVar, extraFlags, relink); } -//---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteLibraryRules (const std::string& linkRuleVar, const std::string& extraFlags, bool relink) { diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 50449fb..bd06298 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -86,7 +86,6 @@ cmMakefileTargetGenerator::New(cmGeneratorTarget *tgt) return result; } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::CreateRuleFile() { // Create a directory for this target. @@ -130,7 +129,6 @@ void cmMakefileTargetGenerator::CreateRuleFile() this->LocalGenerator->WriteSpecialTargetsTop(*this->BuildFileStream); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteTargetBuildRules() { const std::string& config = @@ -212,7 +210,6 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules() } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteCommonCodeRules() { const char* root = (this->Makefile->IsOn("CMAKE_MAKE_INCLUDE_FROM_ROOT")? @@ -310,7 +307,6 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags() } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::MacOSXContentGeneratorType::operator() (cmSourceFile const& source, const char* pkgloc) @@ -362,7 +358,6 @@ cmMakefileTargetGenerator::MacOSXContentGeneratorType::operator() this->Generator->ExtraFiles.insert(output); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::WriteObjectRuleFiles(cmSourceFile const& source) { @@ -436,7 +431,6 @@ void cmMakefileTargetGenerator srcFullPath.c_str()); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::WriteObjectBuildFile(std::string &obj, @@ -904,7 +898,6 @@ cmMakefileTargetGenerator false); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteTargetRequiresRules() { std::vector<std::string> depends; @@ -933,7 +926,6 @@ void cmMakefileTargetGenerator::WriteTargetRequiresRules() depends, no_commands, true); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteTargetCleanRules() { std::vector<std::string> depends; @@ -958,7 +950,6 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules() depends, commands, true); } -//---------------------------------------------------------------------------- bool cmMakefileTargetGenerator::WriteMakeRule( std::ostream& os, const char* comment, @@ -1034,7 +1025,6 @@ bool cmMakefileTargetGenerator::WriteMakeRule( return symbolic; } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteTargetDependRules() { // must write the targets depend info file @@ -1169,7 +1159,6 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() depends, commands, true); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::DriveCustomCommands(std::vector<std::string>& depends) @@ -1191,7 +1180,6 @@ cmMakefileTargetGenerator } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::WriteObjectDependRules(cmSourceFile const& source, std::vector<std::string>& depends) @@ -1205,7 +1193,6 @@ void cmMakefileTargetGenerator } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::GenerateCustomRuleFile(cmCustomCommandGenerator const& ccg) { @@ -1265,7 +1252,6 @@ void cmMakefileTargetGenerator } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::MakeEchoProgress(cmLocalUnixMakefileGenerator3::EchoProgress& progress) const @@ -1277,7 +1263,6 @@ cmMakefileTargetGenerator progress.Arg = progressArg.str(); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::WriteObjectsVariable(std::string& variableName, @@ -1336,7 +1321,6 @@ cmMakefileTargetGenerator *this->BuildFileStream << "\n" << "\n"; } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::WriteObjectsString(std::string& buildObjs) @@ -1346,7 +1330,6 @@ cmMakefileTargetGenerator buildObjs = objStrings[0]; } -//---------------------------------------------------------------------------- class cmMakefileTargetGeneratorObjectStrings { public: @@ -1395,7 +1378,6 @@ private: const char* Space; }; -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::WriteObjectsStrings(std::vector<std::string>& objStrings, @@ -1417,7 +1399,6 @@ cmMakefileTargetGenerator helper.Done(); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteTargetDriverRule( const std::string& main_output, bool relink) @@ -1464,7 +1445,6 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule( depends, no_commands, true); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::AppendTargetDepends(std::vector<std::string>& depends) { @@ -1484,7 +1464,6 @@ void cmMakefileTargetGenerator } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::AppendObjectDepends(std::vector<std::string>& depends) { @@ -1508,7 +1487,6 @@ void cmMakefileTargetGenerator this->BuildFileNameFull.c_str()); } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::AppendLinkDepends(std::vector<std::string>& depends) { @@ -1540,7 +1518,6 @@ void cmMakefileTargetGenerator } } -//---------------------------------------------------------------------------- std::string cmMakefileTargetGenerator::GetLinkRule( const std::string& linkRuleVar) { @@ -1558,7 +1535,6 @@ std::string cmMakefileTargetGenerator::GetLinkRule( return linkRule; } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::CloseFileStreams() { @@ -1621,7 +1597,6 @@ void cmMakefileTargetGenerator::RemoveForbiddenFlags(const char* flagVar, } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::CreateLinkScript(const char* name, @@ -1656,7 +1631,6 @@ cmMakefileTargetGenerator makefile_depends.push_back(linkScriptName); } -//---------------------------------------------------------------------------- std::string cmMakefileTargetGenerator ::CreateResponseFile(const char* name, std::string const& options, @@ -1681,7 +1655,6 @@ cmMakefileTargetGenerator return responseFileName; } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::CreateLinkLibs(std::string& linkLibs, bool relink, @@ -1724,7 +1697,6 @@ cmMakefileTargetGenerator } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator ::CreateObjectLists(bool useLinkScript, bool useArchiveRules, @@ -1797,7 +1769,6 @@ cmMakefileTargetGenerator } } -//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::AddIncludeFlags(std::string& flags, const std::string& lang) { diff --git a/Source/cmMakefileUtilityTargetGenerator.cxx b/Source/cmMakefileUtilityTargetGenerator.cxx index 5b62cbf..1c601c6 100644 --- a/Source/cmMakefileUtilityTargetGenerator.cxx +++ b/Source/cmMakefileUtilityTargetGenerator.cxx @@ -17,7 +17,6 @@ #include "cmMakefile.h" #include "cmSourceFile.h" -//---------------------------------------------------------------------------- cmMakefileUtilityTargetGenerator ::cmMakefileUtilityTargetGenerator(cmGeneratorTarget* target): cmMakefileTargetGenerator(target) @@ -28,14 +27,12 @@ cmMakefileUtilityTargetGenerator this->OSXBundleGenerator->SetMacContentFolders(&this->MacContentFolders); } -//---------------------------------------------------------------------------- cmMakefileUtilityTargetGenerator ::~cmMakefileUtilityTargetGenerator() { delete this->OSXBundleGenerator; } -//---------------------------------------------------------------------------- void cmMakefileUtilityTargetGenerator::WriteRuleFiles() { this->CreateRuleFile(); diff --git a/Source/cmMathCommand.cxx b/Source/cmMathCommand.cxx index f1942c5..d6e1d17 100644 --- a/Source/cmMathCommand.cxx +++ b/Source/cmMathCommand.cxx @@ -13,7 +13,6 @@ #include "cmExprParserHelper.h" -//---------------------------------------------------------------------------- bool cmMathCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -32,7 +31,6 @@ bool cmMathCommand return false; } -//---------------------------------------------------------------------------- bool cmMathCommand::HandleExprCommand(std::vector<std::string> const& args) { if ( args.size() != 3 ) diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 0429421..04e84fe 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -784,7 +784,6 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() globalGen.AddTargetAlias(this->GetTargetName(), >); } -//---------------------------------------------------------------------------- void cmNinjaNormalTargetGenerator::WriteObjectLibStatement() { // Write a phony output that depends on all object files. diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 8830b8f..f077c64 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -783,7 +783,6 @@ cmNinjaTargetGenerator } -//---------------------------------------------------------------------------- void cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()( cmSourceFile const& source, const char* pkgloc) diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx index 9850728..09b99bb 100644 --- a/Source/cmOSXBundleGenerator.cxx +++ b/Source/cmOSXBundleGenerator.cxx @@ -17,7 +17,6 @@ #include <cassert> -//---------------------------------------------------------------------------- cmOSXBundleGenerator:: cmOSXBundleGenerator(cmGeneratorTarget* target, const std::string& configName) @@ -32,13 +31,11 @@ cmOSXBundleGenerator(cmGeneratorTarget* target, } -//---------------------------------------------------------------------------- bool cmOSXBundleGenerator::MustSkip() { return !this->GT->HaveWellDefinedOutputFiles(); } -//---------------------------------------------------------------------------- void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName, std::string& outpath) { @@ -67,7 +64,6 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName, outpath = newoutpath; } -//---------------------------------------------------------------------------- void cmOSXBundleGenerator::CreateFramework( const std::string& targetName, const std::string& outpath) { @@ -172,7 +168,6 @@ void cmOSXBundleGenerator::CreateFramework( } } -//---------------------------------------------------------------------------- void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName, const std::string& root) { @@ -198,7 +193,6 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName, this->Makefile->AddCMakeOutputFile(plist); } -//---------------------------------------------------------------------------- void cmOSXBundleGenerator:: GenerateMacOSXContentStatements( @@ -220,7 +214,6 @@ GenerateMacOSXContentStatements( } } -//---------------------------------------------------------------------------- std::string cmOSXBundleGenerator::InitMacOSXContentDirectory(const char* pkgloc) { diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index 2e884e4..a4d9558 100644 --- a/Source/cmOrderDirectories.cxx +++ b/Source/cmOrderDirectories.cxx @@ -28,7 +28,6 @@ Directory ordering computation. for shared libraries. */ -//---------------------------------------------------------------------------- class cmOrderDirectoriesConstraint { public: @@ -127,7 +126,6 @@ protected: int DirectoryIndex; }; -//---------------------------------------------------------------------------- bool cmOrderDirectoriesConstraint::FileMayConflict(std::string const& dir, std::string const& name) { @@ -149,7 +147,6 @@ bool cmOrderDirectoriesConstraint::FileMayConflict(std::string const& dir, return fi != files.end(); } -//---------------------------------------------------------------------------- class cmOrderDirectoriesConstraintSOName: public cmOrderDirectoriesConstraint { public: @@ -189,7 +186,6 @@ private: std::string SOName; }; -//---------------------------------------------------------------------------- bool cmOrderDirectoriesConstraintSOName::FindConflict(std::string const& dir) { // Determine which type of check to do. @@ -224,7 +220,6 @@ bool cmOrderDirectoriesConstraintSOName::FindConflict(std::string const& dir) return false; } -//---------------------------------------------------------------------------- class cmOrderDirectoriesConstraintLibrary: public cmOrderDirectoriesConstraint { public: @@ -242,7 +237,6 @@ public: virtual bool FindConflict(std::string const& dir); }; -//---------------------------------------------------------------------------- bool cmOrderDirectoriesConstraintLibrary::FindConflict(std::string const& dir) { // We have the library file name. Check if it will be found. @@ -276,7 +270,6 @@ bool cmOrderDirectoriesConstraintLibrary::FindConflict(std::string const& dir) return false; } -//---------------------------------------------------------------------------- cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg, const cmGeneratorTarget* target, const char* purpose) @@ -287,14 +280,12 @@ cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg, this->Computed = false; } -//---------------------------------------------------------------------------- cmOrderDirectories::~cmOrderDirectories() { cmDeleteAll(this->ConstraintEntries); cmDeleteAll(this->ImplicitDirEntries); } -//---------------------------------------------------------------------------- std::vector<std::string> const& cmOrderDirectories::GetOrderedDirectories() { if(!this->Computed) @@ -307,7 +298,6 @@ std::vector<std::string> const& cmOrderDirectories::GetOrderedDirectories() return this->OrderedDirectories; } -//---------------------------------------------------------------------------- void cmOrderDirectories::AddRuntimeLibrary(std::string const& fullPath, const char* soname) { @@ -353,7 +343,6 @@ void cmOrderDirectories::AddRuntimeLibrary(std::string const& fullPath, } } -//---------------------------------------------------------------------------- void cmOrderDirectories::AddLinkLibrary(std::string const& fullPath) { // Link extension info is required for library constraints. @@ -381,7 +370,6 @@ void cmOrderDirectories::AddLinkLibrary(std::string const& fullPath) } } -//---------------------------------------------------------------------------- void cmOrderDirectories ::AddUserDirectories(std::vector<std::string> const& extra) @@ -390,7 +378,6 @@ cmOrderDirectories extra.begin(), extra.end()); } -//---------------------------------------------------------------------------- void cmOrderDirectories ::AddLanguageDirectories(std::vector<std::string> const& dirs) @@ -399,7 +386,6 @@ cmOrderDirectories dirs.begin(), dirs.end()); } -//---------------------------------------------------------------------------- void cmOrderDirectories ::SetImplicitDirectories(std::set<std::string> const& implicitDirs) @@ -407,7 +393,6 @@ cmOrderDirectories this->ImplicitDirectories = implicitDirs; } -//---------------------------------------------------------------------------- void cmOrderDirectories ::SetLinkExtensionInfo(std::vector<std::string> const& linkExtensions, @@ -417,7 +402,6 @@ cmOrderDirectories this->RemoveLibraryExtension.compile(removeExtRegex.c_str()); } -//---------------------------------------------------------------------------- void cmOrderDirectories::CollectOriginalDirectories() { // Add user directories specified for inclusion. These should be @@ -435,7 +419,6 @@ void cmOrderDirectories::CollectOriginalDirectories() this->AddOriginalDirectories(this->LanguageDirectories); } -//---------------------------------------------------------------------------- int cmOrderDirectories::AddOriginalDirectory(std::string const& dir) { // Add the runtime directory with a unique index. @@ -452,7 +435,6 @@ int cmOrderDirectories::AddOriginalDirectory(std::string const& dir) return i->second; } -//---------------------------------------------------------------------------- void cmOrderDirectories ::AddOriginalDirectories(std::vector<std::string> const& dirs) @@ -478,7 +460,6 @@ cmOrderDirectories } } -//---------------------------------------------------------------------------- struct cmOrderDirectoriesCompare { typedef std::pair<int, int> ConflictPair; @@ -493,7 +474,6 @@ struct cmOrderDirectoriesCompare } }; -//---------------------------------------------------------------------------- void cmOrderDirectories::FindConflicts() { // Allocate the conflict graph. @@ -525,7 +505,6 @@ void cmOrderDirectories::FindConflicts() this->FindImplicitConflicts(); } -//---------------------------------------------------------------------------- void cmOrderDirectories::FindImplicitConflicts() { // Check for items in implicit link directories that have conflicts @@ -556,7 +535,6 @@ void cmOrderDirectories::FindImplicitConflicts() this->Target->GetBacktrace()); } -//---------------------------------------------------------------------------- void cmOrderDirectories::OrderDirectories() { // Allow a cycle to be diagnosed once. @@ -572,7 +550,6 @@ void cmOrderDirectories::OrderDirectories() } } -//---------------------------------------------------------------------------- void cmOrderDirectories::VisitDirectory(unsigned int i) { // Skip nodes already visited. @@ -603,7 +580,6 @@ void cmOrderDirectories::VisitDirectory(unsigned int i) this->OrderedDirectories.push_back(this->OriginalDirectories[i]); } -//---------------------------------------------------------------------------- void cmOrderDirectories::DiagnoseCycle() { // Report the cycle at most once. diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index 3c5d2f4..be14230 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -25,7 +25,6 @@ cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot) assert(this->StateSnapshot.IsValid()); } -//---------------------------------------------------------------------------- std::string cmOutputConverter::ConvertToOutputForExistingCommon(const std::string& remote, std::string const& result, @@ -48,7 +47,6 @@ cmOutputConverter::ConvertToOutputForExistingCommon(const std::string& remote, return result; } -//---------------------------------------------------------------------------- std::string cmOutputConverter::ConvertToOutputForExisting(const std::string& remote, RelativeRoot local, @@ -63,7 +61,6 @@ cmOutputConverter::ConvertToOutputForExisting(const std::string& remote, return this->ConvertToOutputForExistingCommon(remote, result, format); } -//---------------------------------------------------------------------------- std::string cmOutputConverter::ConvertToOutputForExisting(RelativeRoot remote, const std::string& local, @@ -77,7 +74,6 @@ cmOutputConverter::ConvertToOutputForExisting(RelativeRoot remote, return this->ConvertToOutputForExistingCommon(remotePath, result, format); } -//---------------------------------------------------------------------------- const char* cmOutputConverter::GetRelativeRootPath(RelativeRoot relroot) const { switch (relroot) @@ -131,7 +127,6 @@ std::string cmOutputConverter::Convert(const std::string& source, return this->ConvertToOutputFormat(result, output); } -//---------------------------------------------------------------------------- std::string cmOutputConverter::ConvertToOutputFormat(const std::string& source, OutputFormat output) const { @@ -153,7 +148,6 @@ std::string cmOutputConverter::ConvertToOutputFormat(const std::string& source, return result; } -//---------------------------------------------------------------------------- std::string cmOutputConverter::ConvertDirectorySeparatorsForShell( const std::string& source) const { @@ -176,7 +170,6 @@ std::string cmOutputConverter::ConvertDirectorySeparatorsForShell( return result; } -//---------------------------------------------------------------------------- std::string cmOutputConverter::Convert(RelativeRoot remote, const std::string& local, OutputFormat output, @@ -198,14 +191,12 @@ std::string cmOutputConverter::Convert(RelativeRoot remote, return this->ConvertToOutputFormat(remotePath, output); } -//---------------------------------------------------------------------------- static bool cmOutputConverterNotAbove(const char* a, const char* b) { return (cmSystemTools::ComparePath(a, b) || cmSystemTools::IsSubDirectory(a, b)); } -//---------------------------------------------------------------------------- std::string cmOutputConverter::ConvertToRelativePath(const std::vector<std::string>& local, const std::string& in_remote, @@ -309,7 +300,6 @@ cmOutputConverter::ConvertToRelativePath(const std::vector<std::string>& local, return relative; } -//---------------------------------------------------------------------------- static bool cmOutputConverterIsShellOperator(const std::string& str) { static std::set<std::string> shellOperators; @@ -331,7 +321,6 @@ static bool cmOutputConverterIsShellOperator(const std::string& str) return shellOperators.count(str) > 0; } -//---------------------------------------------------------------------------- std::string cmOutputConverter::EscapeForShell(const std::string& str, bool makeVars, bool forEcho, @@ -396,7 +385,6 @@ std::string cmOutputConverter::EscapeForShell(const std::string& str, return std::string(&arg[0]); } -//---------------------------------------------------------------------------- std::string cmOutputConverter::EscapeForCMake(const std::string& str) { // Always double-quote the argument to take care of most escapes. @@ -428,7 +416,6 @@ std::string cmOutputConverter::EscapeForCMake(const std::string& str) return result; } -//---------------------------------------------------------------------------- std::string cmOutputConverter::EscapeWindowsShellArgument(const char* arg, int shell_flags) { @@ -448,7 +435,6 @@ cmOutputConverter::EscapeWindowsShellArgument(const char* arg, int shell_flags) return result; } -//---------------------------------------------------------------------------- cmOutputConverter::FortranFormat cmOutputConverter::GetFortranFormat(const char* value) { @@ -483,7 +469,6 @@ cmState* cmOutputConverter::GetState() const return this->StateSnapshot.GetState(); } -//---------------------------------------------------------------------------- /* Notes: @@ -518,13 +503,11 @@ redirection character (for example, ^>, ^<, or ^| ). If you need to use the caret character itself (^), use two in a row (^^). */ -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell__CharIsWhitespace(char c) { return ((c == ' ') || (c == '\t')); } -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell__CharNeedsQuotesOnUnix(char c) { return ((c == '\'') || (c == '`') || (c == ';') || (c == '#') || @@ -533,14 +516,12 @@ int cmOutputConverter::Shell__CharNeedsQuotesOnUnix(char c) (c == '*') || (c == '^') || (c == '\\')); } -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell__CharNeedsQuotesOnWindows(char c) { return ((c == '\'') || (c == '#') || (c == '&') || (c == '<') || (c == '>') || (c == '|') || (c == '^')); } -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell__CharNeedsQuotes(char c, int isUnix, int flags) { /* On Windows the built-in command shell echo never needs quotes. */ @@ -574,13 +555,11 @@ int cmOutputConverter::Shell__CharNeedsQuotes(char c, int isUnix, int flags) return 0; } -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell__CharIsMakeVariableName(char c) { return c && (c == '_' || isalpha(((int)c))); } -/*--------------------------------------------------------------------------*/ const char* cmOutputConverter::Shell__SkipMakeVariables(const char* c) { while(*c == '$' && *(c+1) == '(') @@ -625,7 +604,6 @@ flag later when we understand applications of this better. */ #define KWSYS_SYSTEM_SHELL_QUOTE_MAKE_VARIABLES 0 -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell__ArgumentNeedsQuotes(const char* in, int isUnix, int flags) { @@ -684,7 +662,6 @@ int cmOutputConverter::Shell__ArgumentNeedsQuotes(const char* in, return 0; } -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell__GetArgumentSize(const char* in, int isUnix, int flags) { @@ -819,7 +796,6 @@ int cmOutputConverter::Shell__GetArgumentSize(const char* in, return size; } -/*--------------------------------------------------------------------------*/ char* cmOutputConverter::Shell__GetArgument(const char* in, char* out, int isUnix, int flags) { @@ -1037,28 +1013,24 @@ char* cmOutputConverter::Shell__GetArgument(const char* in, char* out, return out; } -/*--------------------------------------------------------------------------*/ char* cmOutputConverter::Shell_GetArgumentForWindows(const char* in, char* out, int flags) { return Shell__GetArgument(in, out, 0, flags); } -/*--------------------------------------------------------------------------*/ char* cmOutputConverter::Shell_GetArgumentForUnix(const char* in, char* out, int flags) { return Shell__GetArgument(in, out, 1, flags); } -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell_GetArgumentSizeForWindows(const char* in, int flags) { return Shell__GetArgumentSize(in, 0, flags); } -/*--------------------------------------------------------------------------*/ int cmOutputConverter::Shell_GetArgumentSizeForUnix(const char* in, int flags) { diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx index 7fc8ae4..8d78921 100644 --- a/Source/cmParseArgumentsCommand.cxx +++ b/Source/cmParseArgumentsCommand.cxx @@ -15,7 +15,6 @@ #include "cmAlgorithms.h" -//---------------------------------------------------------------------------- bool cmParseArgumentsCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { diff --git a/Source/cmPathLabel.cxx b/Source/cmPathLabel.cxx index 67d56e1..f3b0864 100644 --- a/Source/cmPathLabel.cxx +++ b/Source/cmPathLabel.cxx @@ -12,7 +12,6 @@ #include "cmPathLabel.h" -//---------------------------------------------------------------------------- cmPathLabel::cmPathLabel(const std::string& label) : Label(label), Hash(0) { @@ -28,13 +27,11 @@ cmPathLabel::cmPathLabel(const std::string& label) this->Hash += ((this->Hash & 0x0001FFFF) << 15); } -//---------------------------------------------------------------------------- bool cmPathLabel::operator < (const cmPathLabel& l) const { return this->Hash < l.Hash; } -//---------------------------------------------------------------------------- bool cmPathLabel::operator == (const cmPathLabel& l) const { return this->Hash == l.Hash; diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 0432da5..b0ca675 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -123,7 +123,6 @@ const char* idToShortDescription(cmPolicies::PolicyID id) return 0; } -//---------------------------------------------------------------------------- static void DiagnoseAncientPolicies( std::vector<cmPolicies::PolicyID> const& ancient, unsigned int majorVer, @@ -148,7 +147,6 @@ static void DiagnoseAncientPolicies( mf->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- static bool GetPolicyDefault(cmMakefile* mf, std::string const& policy, cmPolicies::PolicyStatus* defaultSetting) { @@ -178,7 +176,6 @@ static bool GetPolicyDefault(cmMakefile* mf, std::string const& policy, return true; } -//---------------------------------------------------------------------------- bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf, const char *version) { @@ -342,7 +339,6 @@ cmPolicies::GetPolicyStatus(cmPolicies::PolicyID) return cmPolicies::WARN; } -//---------------------------------------------------------------------------- std::string cmPolicies::GetRequiredAlwaysPolicyError(cmPolicies::PolicyID id) { diff --git a/Source/cmProcessTools.cxx b/Source/cmProcessTools.cxx index 15d9ed0..41f6e26 100644 --- a/Source/cmProcessTools.cxx +++ b/Source/cmProcessTools.cxx @@ -13,7 +13,6 @@ #include <cmsys/Process.h> -//---------------------------------------------------------------------------- void cmProcessTools::RunProcess(struct cmsysProcess_s* cp, OutputParser* out, OutputParser* err) { @@ -42,20 +41,17 @@ void cmProcessTools::RunProcess(struct cmsysProcess_s* cp, } -//---------------------------------------------------------------------------- cmProcessTools::LineParser::LineParser(char sep, bool ignoreCR): Log(0), Prefix(0), Separator(sep), LineEnd('\0'), IgnoreCR(ignoreCR) { } -//---------------------------------------------------------------------------- void cmProcessTools::LineParser::SetLog(std::ostream* log, const char* prefix) { this->Log = log; this->Prefix = prefix? prefix : ""; } -//---------------------------------------------------------------------------- bool cmProcessTools::LineParser::ProcessChunk(const char* first, int length) { const char* last = first + length; diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx index 44d4289..ad545aa 100644 --- a/Source/cmRST.cxx +++ b/Source/cmRST.cxx @@ -17,7 +17,6 @@ #include <cmsys/FStream.hxx> #include <ctype.h> -//---------------------------------------------------------------------------- cmRST::cmRST(std::ostream& os, std::string const& docroot): OS(os), DocRoot(docroot), @@ -52,7 +51,6 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot): this->Replace["|release|"] = cmVersion::GetCMakeVersion(); } -//---------------------------------------------------------------------------- bool cmRST::ProcessFile(std::string const& fname, bool isModule) { cmsys::ifstream fin(fname.c_str()); @@ -73,7 +71,6 @@ bool cmRST::ProcessFile(std::string const& fname, bool isModule) return false; } -//---------------------------------------------------------------------------- void cmRST::ProcessRST(std::istream& is) { std::string line; @@ -84,7 +81,6 @@ void cmRST::ProcessRST(std::istream& is) this->Reset(); } -//---------------------------------------------------------------------------- void cmRST::ProcessModule(std::istream& is) { std::string line; @@ -148,7 +144,6 @@ void cmRST::ProcessModule(std::istream& is) } } -//---------------------------------------------------------------------------- void cmRST::Reset() { if(!this->MarkupLines.empty()) @@ -169,7 +164,6 @@ void cmRST::Reset() this->MarkupLines.clear(); } -//---------------------------------------------------------------------------- void cmRST::ProcessLine(std::string const& line) { bool lastLineEndedInColonColon = this->LastLineEndedInColonColon; @@ -277,14 +271,12 @@ void cmRST::ProcessLine(std::string const& line) } } -//---------------------------------------------------------------------------- void cmRST::NormalLine(std::string const& line) { this->Reset(); this->OutputLine(line, true); } -//---------------------------------------------------------------------------- void cmRST::OutputLine(std::string const& line_in, bool inlineMarkup) { if(this->OutputLinePending) @@ -319,7 +311,6 @@ void cmRST::OutputLine(std::string const& line_in, bool inlineMarkup) } } -//---------------------------------------------------------------------------- std::string cmRST::ReplaceSubstitutions(std::string const& line) { std::string out; @@ -349,7 +340,6 @@ std::string cmRST::ReplaceSubstitutions(std::string const& line) return out; } -//---------------------------------------------------------------------------- void cmRST::OutputMarkupLines(bool inlineMarkup) { for(std::vector<std::string>::iterator i = this->MarkupLines.begin(); @@ -365,7 +355,6 @@ void cmRST::OutputMarkupLines(bool inlineMarkup) this->OutputLinePending = true; } -//---------------------------------------------------------------------------- bool cmRST::ProcessInclude(std::string file, IncludeType type) { bool found = false; @@ -396,25 +385,21 @@ bool cmRST::ProcessInclude(std::string file, IncludeType type) return found; } -//---------------------------------------------------------------------------- void cmRST::ProcessDirectiveParsedLiteral() { this->OutputMarkupLines(true); } -//---------------------------------------------------------------------------- void cmRST::ProcessDirectiveLiteralBlock() { this->OutputMarkupLines(false); } -//---------------------------------------------------------------------------- void cmRST::ProcessDirectiveCodeBlock() { this->OutputMarkupLines(false); } -//---------------------------------------------------------------------------- void cmRST::ProcessDirectiveReplace() { // Record markup lines as replacement text. @@ -423,7 +408,6 @@ void cmRST::ProcessDirectiveReplace() this->ReplaceName = ""; } -//---------------------------------------------------------------------------- void cmRST::ProcessDirectiveTocTree() { // Process documents referenced by toctree directive. @@ -446,7 +430,6 @@ void cmRST::ProcessDirectiveTocTree() } } -//---------------------------------------------------------------------------- void cmRST::UnindentLines(std::vector<std::string>& lines) { // Remove the common indentation from the second and later lines. diff --git a/Source/cmScriptGenerator.cxx b/Source/cmScriptGenerator.cxx index e44b236..3b8a20e 100644 --- a/Source/cmScriptGenerator.cxx +++ b/Source/cmScriptGenerator.cxx @@ -13,7 +13,6 @@ #include "cmSystemTools.h" -//---------------------------------------------------------------------------- cmScriptGenerator ::cmScriptGenerator(const std::string& config_var, std::vector<std::string> const& configurations): @@ -25,13 +24,11 @@ cmScriptGenerator { } -//---------------------------------------------------------------------------- cmScriptGenerator ::~cmScriptGenerator() { } -//---------------------------------------------------------------------------- void cmScriptGenerator ::Generate(std::ostream& os, const std::string& config, @@ -44,7 +41,6 @@ cmScriptGenerator this->ConfigurationTypes = 0; } -//---------------------------------------------------------------------------- static void cmScriptGeneratorEncodeConfig(const std::string& config, std::string& result) { @@ -71,7 +67,6 @@ static void cmScriptGeneratorEncodeConfig(const std::string& config, } } -//---------------------------------------------------------------------------- std::string cmScriptGenerator::CreateConfigTest(const std::string& config) { @@ -86,7 +81,6 @@ cmScriptGenerator::CreateConfigTest(const std::string& config) return result; } -//---------------------------------------------------------------------------- std::string cmScriptGenerator::CreateConfigTest(std::vector<std::string> const& configs) { @@ -105,7 +99,6 @@ cmScriptGenerator::CreateConfigTest(std::vector<std::string> const& configs) return result; } -//---------------------------------------------------------------------------- void cmScriptGenerator::GenerateScript(std::ostream& os) { // Track indentation. @@ -115,7 +108,6 @@ void cmScriptGenerator::GenerateScript(std::ostream& os) this->GenerateScriptConfigs(os, indent); } -//---------------------------------------------------------------------------- void cmScriptGenerator::GenerateScriptConfigs(std::ostream& os, Indent const& indent) { @@ -129,7 +121,6 @@ void cmScriptGenerator::GenerateScriptConfigs(std::ostream& os, } } -//---------------------------------------------------------------------------- void cmScriptGenerator::GenerateScriptActions(std::ostream& os, Indent const& indent) { @@ -141,7 +132,6 @@ void cmScriptGenerator::GenerateScriptActions(std::ostream& os, } } -//---------------------------------------------------------------------------- void cmScriptGenerator::GenerateScriptForConfig(std::ostream&, const std::string&, Indent const&) @@ -149,7 +139,6 @@ void cmScriptGenerator::GenerateScriptForConfig(std::ostream&, // No actions for this generator. } -//---------------------------------------------------------------------------- bool cmScriptGenerator::GeneratesForConfig(const std::string& config) { // If this is not a configuration-specific rule then we install. @@ -173,7 +162,6 @@ bool cmScriptGenerator::GeneratesForConfig(const std::string& config) return false; } -//---------------------------------------------------------------------------- void cmScriptGenerator::GenerateScriptActionsOnce(std::ostream& os, Indent const& indent) { @@ -192,7 +180,6 @@ void cmScriptGenerator::GenerateScriptActionsOnce(std::ostream& os, } } -//---------------------------------------------------------------------------- void cmScriptGenerator::GenerateScriptActionsPerConfig(std::ostream& os, Indent const& indent) { diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx index 70855b3..28798c1 100644 --- a/Source/cmSearchPath.cxx +++ b/Source/cmSearchPath.cxx @@ -14,18 +14,15 @@ #include "cmAlgorithms.h" #include "cmFindCommon.h" -//---------------------------------------------------------------------------- cmSearchPath::cmSearchPath(cmFindCommon* findCmd) : FC(findCmd) { } -//---------------------------------------------------------------------------- cmSearchPath::~cmSearchPath() { } -//---------------------------------------------------------------------------- void cmSearchPath::ExtractWithout(const std::set<std::string>& ignore, std::vector<std::string>& outPaths, @@ -45,13 +42,11 @@ void cmSearchPath::ExtractWithout(const std::set<std::string>& ignore, } } -//---------------------------------------------------------------------------- void cmSearchPath::AddPath(const std::string& path) { this->AddPathInternal(path); } -//---------------------------------------------------------------------------- void cmSearchPath::AddUserPath(const std::string& path) { assert(this->FC != NULL); @@ -90,7 +85,6 @@ void cmSearchPath::AddUserPath(const std::string& path) } } -//---------------------------------------------------------------------------- void cmSearchPath::AddCMakePath(const std::string& variable) { assert(this->FC != NULL); @@ -110,7 +104,6 @@ void cmSearchPath::AddCMakePath(const std::string& variable) } } -//---------------------------------------------------------------------------- void cmSearchPath::AddEnvPath(const std::string& variable) { std::vector<std::string> expanded; @@ -122,7 +115,6 @@ void cmSearchPath::AddEnvPath(const std::string& variable) } } -//---------------------------------------------------------------------------- void cmSearchPath::AddCMakePrefixPath(const std::string& variable) { assert(this->FC != NULL); @@ -138,7 +130,6 @@ void cmSearchPath::AddCMakePrefixPath(const std::string& variable) } } -//---------------------------------------------------------------------------- static std::string cmSearchPathStripBin(std::string const& s) { // If the path is a PREFIX/bin case then add its parent instead. @@ -153,7 +144,6 @@ static std::string cmSearchPathStripBin(std::string const& s) } } -//---------------------------------------------------------------------------- void cmSearchPath::AddEnvPrefixPath(const std::string& variable, bool stripBin) { std::vector<std::string> expanded; @@ -166,7 +156,6 @@ void cmSearchPath::AddEnvPrefixPath(const std::string& variable, bool stripBin) this->AddPrefixPaths(expanded); } -//---------------------------------------------------------------------------- void cmSearchPath::AddSuffixes(const std::vector<std::string>& suffixes) { std::vector<std::string> inPaths; @@ -199,7 +188,6 @@ void cmSearchPath::AddSuffixes(const std::vector<std::string>& suffixes) } } -//---------------------------------------------------------------------------- void cmSearchPath::AddPrefixPaths(const std::vector<std::string>& paths, const char *base) { @@ -254,7 +242,6 @@ void cmSearchPath::AddPrefixPaths(const std::vector<std::string>& paths, } } -//---------------------------------------------------------------------------- void cmSearchPath::AddPathInternal(const std::string& path, const char *base) { assert(this->FC != NULL); diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx index fb13a19..a03f608 100644 --- a/Source/cmSetPropertyCommand.cxx +++ b/Source/cmSetPropertyCommand.cxx @@ -16,7 +16,6 @@ #include "cmSetTestsPropertiesCommand.h" -//---------------------------------------------------------------------------- cmSetPropertyCommand::cmSetPropertyCommand() { this->AppendMode = false; @@ -24,7 +23,6 @@ cmSetPropertyCommand::cmSetPropertyCommand() this->Remove = true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -149,7 +147,6 @@ bool cmSetPropertyCommand return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleGlobalMode() { if(!this->Names.empty()) @@ -178,7 +175,6 @@ bool cmSetPropertyCommand::HandleGlobalMode() return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleDirectoryMode() { if(this->Names.size() > 1) @@ -237,7 +233,6 @@ bool cmSetPropertyCommand::HandleDirectoryMode() return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleTargetMode() { for(std::set<std::string>::const_iterator ni = this->Names.begin(); @@ -268,7 +263,6 @@ bool cmSetPropertyCommand::HandleTargetMode() return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleTarget(cmTarget* target) { // Set or append the property. @@ -293,7 +287,6 @@ bool cmSetPropertyCommand::HandleTarget(cmTarget* target) return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleSourceMode() { for(std::set<std::string>::const_iterator ni = this->Names.begin(); @@ -318,7 +311,6 @@ bool cmSetPropertyCommand::HandleSourceMode() return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleSource(cmSourceFile* sf) { // Set or append the property. @@ -340,7 +332,6 @@ bool cmSetPropertyCommand::HandleSource(cmSourceFile* sf) return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleTestMode() { // Look for tests with all names given. @@ -379,7 +370,6 @@ bool cmSetPropertyCommand::HandleTestMode() return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleTest(cmTest* test) { // Set or append the property. @@ -401,7 +391,6 @@ bool cmSetPropertyCommand::HandleTest(cmTest* test) return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleCacheMode() { if(this->PropertyName == "ADVANCED") @@ -466,7 +455,6 @@ bool cmSetPropertyCommand::HandleCacheMode() return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleCacheEntry(std::string const& cacheKey) { // Set or append the property. @@ -490,7 +478,6 @@ bool cmSetPropertyCommand::HandleCacheEntry(std::string const& cacheKey) return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleInstallMode() { cmake* cm = this->Makefile->GetCMakeInstance(); @@ -517,7 +504,6 @@ bool cmSetPropertyCommand::HandleInstallMode() return true; } -//---------------------------------------------------------------------------- bool cmSetPropertyCommand::HandleInstall(cmInstalledFile* file) { // Set or append the property. diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx index a9ac549..b31bc74 100644 --- a/Source/cmSourceFile.cxx +++ b/Source/cmSourceFile.cxx @@ -16,7 +16,6 @@ #include "cmSystemTools.h" #include "cmake.h" -//---------------------------------------------------------------------------- cmSourceFile::cmSourceFile(cmMakefile* mf, const std::string& name): Location(mf, name) { @@ -26,13 +25,11 @@ cmSourceFile::cmSourceFile(cmMakefile* mf, const std::string& name): cmSystemTools::GetFilenameLastExtension(this->Location.GetName())); } -//---------------------------------------------------------------------------- cmSourceFile::~cmSourceFile() { this->SetCustomCommand(0); } -//---------------------------------------------------------------------------- std::string const& cmSourceFile::GetExtension() const { return this->Extension; @@ -40,19 +37,16 @@ std::string const& cmSourceFile::GetExtension() const const std::string cmSourceFile::propLANGUAGE = "LANGUAGE"; -//---------------------------------------------------------------------------- void cmSourceFile::SetObjectLibrary(std::string const& objlib) { this->ObjectLibrary = objlib; } -//---------------------------------------------------------------------------- std::string cmSourceFile::GetObjectLibrary() const { return this->ObjectLibrary; } -//---------------------------------------------------------------------------- std::string cmSourceFile::GetLanguage() { // If the language was set explicitly by the user then use it. @@ -89,7 +83,6 @@ std::string cmSourceFile::GetLanguage() return static_cast<cmSourceFile const*>(this)->GetLanguage(); } -//---------------------------------------------------------------------------- std::string cmSourceFile::GetLanguage() const { // If the language was set explicitly by the user then use it. @@ -108,13 +101,11 @@ std::string cmSourceFile::GetLanguage() const return ""; } -//---------------------------------------------------------------------------- cmSourceFileLocation const& cmSourceFile::GetLocation() const { return this->Location; } -//---------------------------------------------------------------------------- std::string const& cmSourceFile::GetFullPath(std::string* error) { if(this->FullPath.empty()) @@ -127,13 +118,11 @@ std::string const& cmSourceFile::GetFullPath(std::string* error) return this->FullPath; } -//---------------------------------------------------------------------------- std::string const& cmSourceFile::GetFullPath() const { return this->FullPath; } -//---------------------------------------------------------------------------- bool cmSourceFile::FindFullPath(std::string* error) { // If thie method has already failed once do not try again. @@ -232,7 +221,6 @@ bool cmSourceFile::FindFullPath(std::string* error) return false; } -//---------------------------------------------------------------------------- bool cmSourceFile::TryFullPath(const std::string& path, const std::string& ext) { @@ -250,7 +238,6 @@ bool cmSourceFile::TryFullPath(const std::string& path, return false; } -//---------------------------------------------------------------------------- void cmSourceFile::CheckExtension() { // Compute the extension. @@ -277,7 +264,6 @@ void cmSourceFile::CheckExtension() } } -//---------------------------------------------------------------------------- void cmSourceFile::CheckLanguage(std::string const& ext) { // Try to identify the source file language from the extension. @@ -290,13 +276,11 @@ void cmSourceFile::CheckLanguage(std::string const& ext) } } -//---------------------------------------------------------------------------- bool cmSourceFile::Matches(cmSourceFileLocation const& loc) { return this->Location.Matches(loc); } -//---------------------------------------------------------------------------- void cmSourceFile::SetProperty(const std::string& prop, const char* value) { this->Properties.SetProperty(prop, value); @@ -311,14 +295,12 @@ void cmSourceFile::SetProperty(const std::string& prop, const char* value) } } -//---------------------------------------------------------------------------- void cmSourceFile::AppendProperty(const std::string& prop, const char* value, bool asString) { this->Properties.AppendProperty(prop, value, asString); } -//---------------------------------------------------------------------------- const char* cmSourceFile::GetPropertyForUser(const std::string& prop) { // This method is a consequence of design history and backwards @@ -345,7 +327,6 @@ const char* cmSourceFile::GetPropertyForUser(const std::string& prop) return this->GetProperty(prop); } -//---------------------------------------------------------------------------- const char* cmSourceFile::GetProperty(const std::string& prop) const { // Check for computed properties. @@ -376,25 +357,21 @@ const char* cmSourceFile::GetProperty(const std::string& prop) const return retVal; } -//---------------------------------------------------------------------------- bool cmSourceFile::GetPropertyAsBool(const std::string& prop) const { return cmSystemTools::IsOn(this->GetProperty(prop)); } -//---------------------------------------------------------------------------- cmCustomCommand* cmSourceFile::GetCustomCommand() { return this->CustomCommand; } -//---------------------------------------------------------------------------- cmCustomCommand const* cmSourceFile::GetCustomCommand() const { return this->CustomCommand; } -//---------------------------------------------------------------------------- void cmSourceFile::SetCustomCommand(cmCustomCommand* cc) { cmCustomCommand* old = this->CustomCommand; diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 988ddeb..6e47402 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -18,14 +18,12 @@ #include "assert.h" -//---------------------------------------------------------------------------- cmSourceFileLocation::cmSourceFileLocation() : Makefile(0), AmbiguousDirectory(true), AmbiguousExtension(true) { } -//---------------------------------------------------------------------------- cmSourceFileLocation::cmSourceFileLocation(const cmSourceFileLocation& loc) : Makefile(loc.Makefile) { @@ -35,7 +33,6 @@ cmSourceFileLocation::cmSourceFileLocation(const cmSourceFileLocation& loc) this->Name = loc.Name; } -//---------------------------------------------------------------------------- cmSourceFileLocation& cmSourceFileLocation::operator=(const cmSourceFileLocation& loc) { @@ -52,7 +49,6 @@ cmSourceFileLocation::operator=(const cmSourceFileLocation& loc) return *this; } -//---------------------------------------------------------------------------- cmSourceFileLocation ::cmSourceFileLocation(cmMakefile const* mf, const std::string& name) : Makefile(mf) @@ -69,7 +65,6 @@ cmSourceFileLocation this->UpdateExtension(name); } -//---------------------------------------------------------------------------- void cmSourceFileLocation::Update(cmSourceFileLocation const& loc) { if(this->AmbiguousDirectory && !loc.AmbiguousDirectory) @@ -84,7 +79,6 @@ void cmSourceFileLocation::Update(cmSourceFileLocation const& loc) } } -//---------------------------------------------------------------------------- void cmSourceFileLocation::DirectoryUseSource() { assert(this->Makefile); @@ -97,7 +91,6 @@ void cmSourceFileLocation::DirectoryUseSource() } } -//---------------------------------------------------------------------------- void cmSourceFileLocation::DirectoryUseBinary() { assert(this->Makefile); @@ -110,7 +103,6 @@ void cmSourceFileLocation::DirectoryUseBinary() } } -//---------------------------------------------------------------------------- void cmSourceFileLocation::UpdateExtension(const std::string& name) { assert(this->Makefile); @@ -168,7 +160,6 @@ void cmSourceFileLocation::UpdateExtension(const std::string& name) } } -//---------------------------------------------------------------------------- bool cmSourceFileLocation ::MatchesAmbiguousExtension(cmSourceFileLocation const& loc) const @@ -210,7 +201,6 @@ cmSourceFileLocation return false; } -//---------------------------------------------------------------------------- bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc) { assert(this->Makefile); diff --git a/Source/cmSourceGroup.cxx b/Source/cmSourceGroup.cxx index 8fed95e..34b4315 100644 --- a/Source/cmSourceGroup.cxx +++ b/Source/cmSourceGroup.cxx @@ -17,7 +17,6 @@ public: std::vector<cmSourceGroup> GroupChildren; }; -//---------------------------------------------------------------------------- cmSourceGroup::cmSourceGroup(const char* name, const char* regex, const char* parentName): Name(name) { @@ -31,13 +30,11 @@ cmSourceGroup::cmSourceGroup(const char* name, const char* regex, this->FullName += this->Name; } -//---------------------------------------------------------------------------- cmSourceGroup::~cmSourceGroup() { delete this->Internal; } -//---------------------------------------------------------------------------- cmSourceGroup::cmSourceGroup(cmSourceGroup const& r) { this->Name = r.Name; @@ -48,7 +45,6 @@ cmSourceGroup::cmSourceGroup(cmSourceGroup const& r) this->Internal = new cmSourceGroupInternals(*r.Internal); } -//---------------------------------------------------------------------------- cmSourceGroup& cmSourceGroup::operator=(cmSourceGroup const& r) { this->Name = r.Name; @@ -59,7 +55,6 @@ cmSourceGroup& cmSourceGroup::operator=(cmSourceGroup const& r) return *this; } -//---------------------------------------------------------------------------- void cmSourceGroup::SetGroupRegex(const char* regex) { if(regex) @@ -72,31 +67,26 @@ void cmSourceGroup::SetGroupRegex(const char* regex) } } -//---------------------------------------------------------------------------- void cmSourceGroup::AddGroupFile(const std::string& name) { this->GroupFiles.insert(name); } -//---------------------------------------------------------------------------- const char* cmSourceGroup::GetName() const { return this->Name.c_str(); } -//---------------------------------------------------------------------------- const char* cmSourceGroup::GetFullName() const { return this->FullName.c_str(); } -//---------------------------------------------------------------------------- bool cmSourceGroup::MatchesRegex(const char* name) { return this->GroupRegex.find(name); } -//---------------------------------------------------------------------------- bool cmSourceGroup::MatchesFiles(const char* name) { std::set<std::string>::const_iterator i = this->GroupFiles.find(name); @@ -107,25 +97,21 @@ bool cmSourceGroup::MatchesFiles(const char* name) return false; } -//---------------------------------------------------------------------------- void cmSourceGroup::AssignSource(const cmSourceFile* sf) { this->SourceFiles.push_back(sf); } -//---------------------------------------------------------------------------- const std::vector<const cmSourceFile*>& cmSourceGroup::GetSourceFiles() const { return this->SourceFiles; } -//---------------------------------------------------------------------------- void cmSourceGroup::AddChild(cmSourceGroup child) { this->Internal->GroupChildren.push_back(child); } -//---------------------------------------------------------------------------- cmSourceGroup *cmSourceGroup::LookupChild(const char* name) const { // initializing iterators diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index e10e1ae..757425f 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -23,7 +23,6 @@ #include <cmTimestamp.h> #include <cmUuid.h> -//---------------------------------------------------------------------------- bool cmStringCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -121,7 +120,6 @@ bool cmStringCommand return false; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args) { #if defined(CMAKE_BUILD_WITH_CMAKE) @@ -149,7 +147,6 @@ bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args) #endif } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleToUpperLowerCommand( std::vector<std::string> const& args, bool toUpper) { @@ -176,7 +173,6 @@ bool cmStringCommand::HandleToUpperLowerCommand( return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleAsciiCommand(std::vector<std::string> const& args) { if ( args.size() < 3 ) @@ -208,7 +204,6 @@ bool cmStringCommand::HandleAsciiCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleConfigureCommand( std::vector<std::string> const& args) { @@ -255,7 +250,6 @@ bool cmStringCommand::HandleConfigureCommand( return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleRegexCommand(std::vector<std::string> const& args) { if(args.size() < 2) @@ -300,7 +294,6 @@ bool cmStringCommand::HandleRegexCommand(std::vector<std::string> const& args) return false; } -//---------------------------------------------------------------------------- bool cmStringCommand::RegexMatch(std::vector<std::string> const& args) { //"STRING(REGEX MATCH <regular_expression> <output variable> @@ -345,7 +338,6 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args) { //"STRING(REGEX MATCHALL <regular_expression> <output variable> <input> @@ -396,7 +388,6 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::RegexReplace(std::vector<std::string> const& args) { //"STRING(REGEX REPLACE <regular_expression> <replace_expression> @@ -533,7 +524,6 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleFindCommand(std::vector<std::string> const& args) { @@ -595,7 +585,6 @@ bool cmStringCommand::HandleFindCommand(std::vector<std::string> const& return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleCompareCommand(std::vector<std::string> const& args) { @@ -652,7 +641,6 @@ bool cmStringCommand::HandleCompareCommand(std::vector<std::string> const& return false; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const& args) { @@ -675,7 +663,6 @@ bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const& return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const& args) { @@ -713,7 +700,6 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const& return true; } -//---------------------------------------------------------------------------- bool cmStringCommand ::HandleLengthCommand(std::vector<std::string> const& args) { @@ -734,7 +720,6 @@ bool cmStringCommand return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleAppendCommand(std::vector<std::string> const& args) { if(args.size() < 2) @@ -762,7 +747,6 @@ bool cmStringCommand::HandleAppendCommand(std::vector<std::string> const& args) return true; } -//---------------------------------------------------------------------------- bool cmStringCommand ::HandleConcatCommand(std::vector<std::string> const& args) { @@ -779,7 +763,6 @@ bool cmStringCommand return true; } -//---------------------------------------------------------------------------- bool cmStringCommand ::HandleMakeCIdentifierCommand(std::vector<std::string> const& args) { @@ -797,7 +780,6 @@ bool cmStringCommand return true; } -//---------------------------------------------------------------------------- bool cmStringCommand ::HandleGenexStripCommand(std::vector<std::string> const& args) { @@ -818,7 +800,6 @@ bool cmStringCommand return true; } -//---------------------------------------------------------------------------- bool cmStringCommand::HandleStripCommand( std::vector<std::string> const& args) { @@ -867,7 +848,6 @@ bool cmStringCommand::HandleStripCommand( return true; } -//---------------------------------------------------------------------------- bool cmStringCommand ::HandleRandomCommand(std::vector<std::string> const& args) { @@ -950,7 +930,6 @@ bool cmStringCommand return true; } -//---------------------------------------------------------------------------- bool cmStringCommand ::HandleTimestampCommand(std::vector<std::string> const& args) { diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 5ae9910..08dda81 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -462,7 +462,6 @@ bool cmSystemTools::IsOff(const char* val) return (offValues.count(v) > 0); } -//---------------------------------------------------------------------------- void cmSystemTools::ParseWindowsCommandLine(const char* command, std::vector<std::string>& args) { @@ -532,7 +531,6 @@ void cmSystemTools::ParseWindowsCommandLine(const char* command, } } -//---------------------------------------------------------------------------- class cmSystemToolsArgV { char** ArgV; @@ -555,7 +553,6 @@ public: } }; -//---------------------------------------------------------------------------- void cmSystemTools::ParseUnixCommandLine(const char* command, std::vector<std::string>& args) { @@ -894,7 +891,6 @@ bool cmSystemTools::CopyFileIfDifferent(const char* source, return Superclass::CopyFileIfDifferent(source, destination); } -//---------------------------------------------------------------------------- #ifdef _WIN32 cmSystemTools::WindowsFileRetry cmSystemTools::GetWindowsFileRetry() { @@ -932,7 +928,6 @@ cmSystemTools::WindowsFileRetry cmSystemTools::GetWindowsFileRetry() } #endif -//---------------------------------------------------------------------------- bool cmSystemTools::RenameFile(const char* oldname, const char* newname) { #ifdef _WIN32 @@ -1007,7 +1002,6 @@ std::string cmSystemTools::ComputeStringMD5(const std::string& input) #endif } -//---------------------------------------------------------------------------- std::string cmSystemTools::ComputeCertificateThumbprint( const std::string& source) { @@ -1455,7 +1449,6 @@ std::string cmSystemTools::CollapseCombinedPath(std::string const& dir, } #ifdef CMAKE_BUILD_WITH_CMAKE -//---------------------------------------------------------------------- bool cmSystemTools::UnsetEnv(const char* value) { #if !defined(HAVE_UNSETENV) @@ -1468,7 +1461,6 @@ bool cmSystemTools::UnsetEnv(const char* value) #endif } -//---------------------------------------------------------------------- std::vector<std::string> cmSystemTools::GetEnvironmentVariables() { std::vector<std::string> env; @@ -1480,7 +1472,6 @@ std::vector<std::string> cmSystemTools::GetEnvironmentVariables() return env; } -//---------------------------------------------------------------------- void cmSystemTools::AppendEnv(std::vector<std::string> const& env) { for(std::vector<std::string>::const_iterator eit = env.begin(); @@ -1490,13 +1481,11 @@ void cmSystemTools::AppendEnv(std::vector<std::string> const& env) } } -//---------------------------------------------------------------------- cmSystemTools::SaveRestoreEnvironment::SaveRestoreEnvironment() { this->Env = cmSystemTools::GetEnvironmentVariables(); } -//---------------------------------------------------------------------- cmSystemTools::SaveRestoreEnvironment::~SaveRestoreEnvironment() { // First clear everything in the current environment: @@ -2028,7 +2017,6 @@ void cmSystemTools::DoNotInheritStdPipes() #endif } -//---------------------------------------------------------------------------- bool cmSystemTools::CopyFileTime(const char* fromFile, const char* toFile) { #if defined(_WIN32) && !defined(__CYGWIN__) @@ -2073,19 +2061,16 @@ bool cmSystemTools::CopyFileTime(const char* fromFile, const char* toFile) return true; } -//---------------------------------------------------------------------------- cmSystemToolsFileTime* cmSystemTools::FileTimeNew() { return new cmSystemToolsFileTime; } -//---------------------------------------------------------------------------- void cmSystemTools::FileTimeDelete(cmSystemToolsFileTime* t) { delete t; } -//---------------------------------------------------------------------------- bool cmSystemTools::FileTimeGet(const char* fname, cmSystemToolsFileTime* t) { #if defined(_WIN32) && !defined(__CYGWIN__) @@ -2113,7 +2098,6 @@ bool cmSystemTools::FileTimeGet(const char* fname, cmSystemToolsFileTime* t) return true; } -//---------------------------------------------------------------------------- bool cmSystemTools::FileTimeSet(const char* fname, cmSystemToolsFileTime* t) { #if defined(_WIN32) && !defined(__CYGWIN__) @@ -2138,7 +2122,6 @@ bool cmSystemTools::FileTimeSet(const char* fname, cmSystemToolsFileTime* t) return true; } -//---------------------------------------------------------------------------- #ifdef _WIN32 # ifndef CRYPT_SILENT # define CRYPT_SILENT 0x40 /* Not defined by VS 6 version of header. */ @@ -2157,7 +2140,6 @@ static int WinCryptRandom(void* data, size_t size) } #endif -//---------------------------------------------------------------------------- unsigned int cmSystemTools::RandomSeed() { #if defined(_WIN32) && !defined(__CYGWIN__) @@ -2205,7 +2187,6 @@ unsigned int cmSystemTools::RandomSeed() #endif } -//---------------------------------------------------------------------------- static std::string cmSystemToolsCMakeCommand; static std::string cmSystemToolsCTestCommand; static std::string cmSystemToolsCPackCommand; @@ -2347,49 +2328,41 @@ void cmSystemTools::FindCMakeResources(const char* argv0) #endif } -//---------------------------------------------------------------------------- std::string const& cmSystemTools::GetCMakeCommand() { return cmSystemToolsCMakeCommand; } -//---------------------------------------------------------------------------- std::string const& cmSystemTools::GetCTestCommand() { return cmSystemToolsCTestCommand; } -//---------------------------------------------------------------------------- std::string const& cmSystemTools::GetCPackCommand() { return cmSystemToolsCPackCommand; } -//---------------------------------------------------------------------------- std::string const& cmSystemTools::GetCMakeCursesCommand() { return cmSystemToolsCMakeCursesCommand; } -//---------------------------------------------------------------------------- std::string const& cmSystemTools::GetCMakeGUICommand() { return cmSystemToolsCMakeGUICommand; } -//---------------------------------------------------------------------------- std::string const& cmSystemTools::GetCMClDepsCommand() { return cmSystemToolsCMClDepsCommand; } -//---------------------------------------------------------------------------- std::string const& cmSystemTools::GetCMakeRoot() { return cmSystemToolsCMakeRoot; } -//---------------------------------------------------------------------------- void cmSystemTools::MakefileColorEcho(int color, const char* message, bool newline, bool enabled) { @@ -2426,7 +2399,6 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message, } } -//---------------------------------------------------------------------------- bool cmSystemTools::GuessLibrarySOName(std::string const& fullPath, std::string& soname) { @@ -2467,7 +2439,6 @@ bool cmSystemTools::GuessLibrarySOName(std::string const& fullPath, return false; } -//---------------------------------------------------------------------------- bool cmSystemTools::GuessLibraryInstallName(std::string const& fullPath, std::string& soname) { @@ -2485,7 +2456,6 @@ bool cmSystemTools::GuessLibraryInstallName(std::string const& fullPath, return false; } -//---------------------------------------------------------------------------- #if defined(CMAKE_USE_ELF_PARSER) std::string::size_type cmSystemToolsFindRPath(std::string const& have, std::string const& want) @@ -2541,7 +2511,6 @@ struct cmSystemToolsRPathInfo }; #endif -//---------------------------------------------------------------------------- bool cmSystemTools::ChangeRPath(std::string const& file, std::string const& oldRPath, std::string const& newRPath, @@ -2755,7 +2724,6 @@ bool cmSystemTools::ChangeRPath(std::string const& file, #endif } -//---------------------------------------------------------------------------- bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op, const char* lhss, const char* rhss) { @@ -2795,7 +2763,6 @@ bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op, return op == cmSystemTools::OP_EQUAL; } -//---------------------------------------------------------------------------- bool cmSystemTools::VersionCompareEqual(std::string const& lhs, std::string const& rhs) { @@ -2803,7 +2770,6 @@ bool cmSystemTools::VersionCompareEqual(std::string const& lhs, cmSystemTools::OP_EQUAL, lhs.c_str(), rhs.c_str()); } -//---------------------------------------------------------------------------- bool cmSystemTools::VersionCompareGreater(std::string const& lhs, std::string const& rhs) { @@ -2811,7 +2777,6 @@ bool cmSystemTools::VersionCompareGreater(std::string const& lhs, cmSystemTools::OP_GREATER, lhs.c_str(), rhs.c_str()); } -//---------------------------------------------------------------------------- bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg, bool* removed) { @@ -2981,7 +2946,6 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg, #endif } -//---------------------------------------------------------------------------- bool cmSystemTools::CheckRPath(std::string const& file, std::string const& newRPath) { @@ -3020,7 +2984,6 @@ bool cmSystemTools::CheckRPath(std::string const& file, #endif } -//---------------------------------------------------------------------------- bool cmSystemTools::RepeatedRemoveDirectory(const char* dir) { // Windows sometimes locks files temporarily so try a few times. @@ -3035,7 +2998,6 @@ bool cmSystemTools::RepeatedRemoveDirectory(const char* dir) return false; } -//---------------------------------------------------------------------------- std::vector<std::string> cmSystemTools::tokenize(const std::string& str, const std::string& sep) { @@ -3067,7 +3029,6 @@ std::vector<std::string> cmSystemTools::tokenize(const std::string& str, return tokens; } -//---------------------------------------------------------------------------- bool cmSystemTools::StringToLong(const char* str, long* value) { errno = 0; @@ -3076,7 +3037,6 @@ bool cmSystemTools::StringToLong(const char* str, long* value) return (*endp == '\0') && (endp != str) && (errno == 0); } -//---------------------------------------------------------------------------- bool cmSystemTools::StringToULong(const char* str, unsigned long* value) { errno = 0; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 25d58f8..d7d301f 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -34,7 +34,6 @@ #define UNORDERED_SET std::set #endif -//---------------------------------------------------------------------------- class cmTargetInternals { public: @@ -52,7 +51,6 @@ public: std::vector<cmListFileBacktrace> LinkImplementationPropertyBacktraces; }; -//---------------------------------------------------------------------------- cmTarget::cmTarget() { this->Makefile = 0; @@ -80,7 +78,6 @@ void cmTarget::SetType(cmState::TargetType type, const std::string& name) } } -//---------------------------------------------------------------------------- void cmTarget::SetMakefile(cmMakefile* mf) { // Set our makefile. @@ -293,7 +290,6 @@ void cmTarget::SetMakefile(cmMakefile* mf) } } -//---------------------------------------------------------------------------- void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile) { if(this->Utilities.insert(u).second && makefile) @@ -303,7 +299,6 @@ void cmTarget::AddUtility(const std::string& u, cmMakefile *makefile) } } -//---------------------------------------------------------------------------- cmListFileBacktrace const* cmTarget::GetUtilityBacktrace( const std::string& u) const { @@ -314,20 +309,17 @@ cmListFileBacktrace const* cmTarget::GetUtilityBacktrace( return &i->second; } -//---------------------------------------------------------------------------- cmListFileBacktrace const& cmTarget::GetBacktrace() const { return this->Backtrace; } -//---------------------------------------------------------------------------- bool cmTarget::IsExecutableWithExports() const { return (this->GetType() == cmState::EXECUTABLE && this->GetPropertyAsBool("ENABLE_EXPORTS")); } -//---------------------------------------------------------------------------- bool cmTarget::HasImportLibrary() const { return (this->DLLPlatform && @@ -335,7 +327,6 @@ bool cmTarget::HasImportLibrary() const this->IsExecutableWithExports())); } -//---------------------------------------------------------------------------- bool cmTarget::IsFrameworkOnApple() const { return (this->GetType() == cmState::SHARED_LIBRARY && @@ -343,7 +334,6 @@ bool cmTarget::IsFrameworkOnApple() const this->GetPropertyAsBool("FRAMEWORK")); } -//---------------------------------------------------------------------------- bool cmTarget::IsAppBundleOnApple() const { return (this->GetType() == cmState::EXECUTABLE && @@ -351,7 +341,6 @@ bool cmTarget::IsAppBundleOnApple() const this->GetPropertyAsBool("MACOSX_BUNDLE")); } -//---------------------------------------------------------------------------- void cmTarget::AddTracedSources(std::vector<std::string> const& srcs) { if (!srcs.empty()) @@ -362,7 +351,6 @@ void cmTarget::AddTracedSources(std::vector<std::string> const& srcs) } } -//---------------------------------------------------------------------------- void cmTarget::AddSources(std::vector<std::string> const& srcs) { std::string srcFiles; @@ -397,7 +385,6 @@ void cmTarget::AddSources(std::vector<std::string> const& srcs) } } -//---------------------------------------------------------------------------- std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s) { std::string src = s; @@ -439,7 +426,6 @@ std::string cmTarget::ProcessSourceItemCMP0049(const std::string& s) return src; } -//---------------------------------------------------------------------------- cmSourceFile* cmTarget::AddSourceCMP0049(const std::string& s) { std::string src = this->ProcessSourceItemCMP0049(s); @@ -450,7 +436,6 @@ cmSourceFile* cmTarget::AddSourceCMP0049(const std::string& s) return this->AddSource(src); } -//---------------------------------------------------------------------------- struct CreateLocation { cmMakefile const* Makefile; @@ -467,7 +452,6 @@ struct CreateLocation } }; -//---------------------------------------------------------------------------- struct LocationMatcher { const cmSourceFileLocation& Needle; @@ -485,7 +469,6 @@ struct LocationMatcher }; -//---------------------------------------------------------------------------- struct TargetPropertyEntryFinder { private: @@ -510,7 +493,6 @@ public: } }; -//---------------------------------------------------------------------------- cmSourceFile* cmTarget::AddSource(const std::string& src) { cmSourceFileLocation sfl(this->Makefile, src); @@ -530,7 +512,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src) return this->Makefile->GetOrCreateSource(src); } -//---------------------------------------------------------------------------- void cmTarget::MergeLinkLibraries( cmMakefile& mf, const std::string& selfname, const LinkLibraryVectorType& libs ) @@ -549,7 +530,6 @@ void cmTarget::MergeLinkLibraries( cmMakefile& mf, this->PrevLinkedLibraries = libs; } -//---------------------------------------------------------------------------- void cmTarget::AddLinkDirectory(const std::string& d) { // Make sure we don't add unnecessary search directories. @@ -559,13 +539,11 @@ void cmTarget::AddLinkDirectory(const std::string& d) } } -//---------------------------------------------------------------------------- const std::vector<std::string>& cmTarget::GetLinkDirectories() const { return this->LinkDirectories; } -//---------------------------------------------------------------------------- void cmTarget::ClearDependencyInformation( cmMakefile& mf, const std::string& target ) { @@ -593,7 +571,6 @@ void cmTarget::ClearDependencyInformation( cmMakefile& mf, } } -//---------------------------------------------------------------------------- std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value, cmTargetLinkLibraryType llt) const { @@ -625,13 +602,11 @@ std::string cmTarget::GetDebugGeneratorExpressions(const std::string &value, return "$<" + configString + ":" + value + ">"; } -//---------------------------------------------------------------------------- static std::string targetNameGenex(const std::string& lib) { return "$<TARGET_NAME:" + lib + ">"; } -//---------------------------------------------------------------------------- bool cmTarget::PushTLLCommandTrace(TLLSignature signature, cmListFileContext const& lfc) { @@ -650,7 +625,6 @@ bool cmTarget::PushTLLCommandTrace(TLLSignature signature, return ret; } -//---------------------------------------------------------------------------- void cmTarget::GetTllSignatureTraces(std::ostringstream &s, TLLSignature sig) const { @@ -671,7 +645,6 @@ void cmTarget::GetTllSignatureTraces(std::ostringstream &s, } } -//---------------------------------------------------------------------------- void cmTarget::AddLinkLibrary(cmMakefile& mf, const std::string& target, const std::string& lib, @@ -742,7 +715,6 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, } -//---------------------------------------------------------------------------- void cmTarget::AddSystemIncludeDirectories(const std::set<std::string> &incs) { @@ -809,7 +781,6 @@ cmBacktraceRange cmTarget::GetLinkImplementationBacktraces() const return cmMakeRange(this->Internal->LinkImplementationPropertyBacktraces); } -//---------------------------------------------------------------------------- static bool whiteListedInterfaceProperty(const std::string& prop) { if(cmHasLiteralPrefix(prop, "INTERFACE_")) @@ -842,7 +813,6 @@ static bool whiteListedInterfaceProperty(const std::string& prop) return false; } -//---------------------------------------------------------------------------- void cmTarget::SetProperty(const std::string& prop, const char* value) { if (this->GetType() == cmState::INTERFACE_LIBRARY @@ -949,7 +919,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value) } } -//---------------------------------------------------------------------------- void cmTarget::AppendProperty(const std::string& prop, const char* value, bool asString) { @@ -1041,7 +1010,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value, } } -//---------------------------------------------------------------------------- void cmTarget::AppendBuildInterfaceIncludes() { if(this->GetType() != cmState::SHARED_LIBRARY && @@ -1073,7 +1041,6 @@ void cmTarget::AppendBuildInterfaceIncludes() } } -//---------------------------------------------------------------------------- void cmTarget::InsertInclude(std::string const& entry, cmListFileBacktrace const& bt, bool before) @@ -1090,7 +1057,6 @@ void cmTarget::InsertInclude(std::string const& entry, this->Internal->IncludeDirectoriesBacktraces.insert(btPosition, bt); } -//---------------------------------------------------------------------------- void cmTarget::InsertCompileOption(std::string const& entry, cmListFileBacktrace const& bt, bool before) @@ -1107,7 +1073,6 @@ void cmTarget::InsertCompileOption(std::string const& entry, this->Internal->CompileOptionsBacktraces.insert(btPosition, bt); } -//---------------------------------------------------------------------------- void cmTarget::InsertCompileDefinition(std::string const& entry, cmListFileBacktrace const& bt) { @@ -1115,7 +1080,6 @@ void cmTarget::InsertCompileDefinition(std::string const& entry, this->Internal->CompileDefinitionsBacktraces.push_back(bt); } -//---------------------------------------------------------------------------- static void cmTargetCheckLINK_INTERFACE_LIBRARIES( const std::string& prop, const char* value, cmMakefile* context, bool imported) @@ -1158,7 +1122,6 @@ static void cmTargetCheckLINK_INTERFACE_LIBRARIES( context->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- static void cmTargetCheckINTERFACE_LINK_LIBRARIES(const char* value, cmMakefile* context) { @@ -1181,7 +1144,6 @@ static void cmTargetCheckINTERFACE_LINK_LIBRARIES(const char* value, context->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- void cmTarget::CheckProperty(const std::string& prop, cmMakefile* context) const { @@ -1209,14 +1171,12 @@ void cmTarget::CheckProperty(const std::string& prop, } } -//---------------------------------------------------------------------------- void cmTarget::MarkAsImported(bool global) { this->IsImportedTarget = true; this->ImportedGloballyVisible = global; } -//---------------------------------------------------------------------------- bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const { if (this->IsImported()) @@ -1252,13 +1212,11 @@ bool cmTarget::HandleLocationPropertyPolicy(cmMakefile* context) const return messageType != cmake::FATAL_ERROR; } -//---------------------------------------------------------------------------- const char *cmTarget::GetProperty(const std::string& prop) const { return this->GetProperty(prop, this->Makefile); } -//---------------------------------------------------------------------------- const char *cmTarget::GetProperty(const std::string& prop, cmMakefile* context) const { @@ -1577,13 +1535,11 @@ const char *cmTarget::GetProperty(const std::string& prop, return retVal; } -//---------------------------------------------------------------------------- bool cmTarget::GetPropertyAsBool(const std::string& prop) const { return cmSystemTools::IsOn(this->GetProperty(prop)); } -//---------------------------------------------------------------------------- const char* cmTarget::GetSuffixVariableInternal(bool implib) const { switch(this->GetType()) @@ -1612,7 +1568,6 @@ const char* cmTarget::GetSuffixVariableInternal(bool implib) const } -//---------------------------------------------------------------------------- const char* cmTarget::GetPrefixVariableInternal(bool implib) const { switch(this->GetType()) @@ -1640,7 +1595,6 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const return ""; } -//---------------------------------------------------------------------------- std::string cmTarget::ImportedGetFullPath(const std::string& config, bool pimplib) const { @@ -1719,7 +1673,6 @@ cmTarget::ImportedGetFullPath(const std::string& config, bool pimplib) const return result; } -//---------------------------------------------------------------------------- void cmTarget::SetPropertyDefault(const std::string& property, const char* default_value) { @@ -1868,13 +1821,11 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config, return true; } -//---------------------------------------------------------------------------- cmTargetInternalPointer::cmTargetInternalPointer() { this->Pointer = new cmTargetInternals; } -//---------------------------------------------------------------------------- cmTargetInternalPointer ::cmTargetInternalPointer(cmTargetInternalPointer const& r) { @@ -1884,13 +1835,11 @@ cmTargetInternalPointer this->Pointer = new cmTargetInternals(*r.Pointer); } -//---------------------------------------------------------------------------- cmTargetInternalPointer::~cmTargetInternalPointer() { delete this->Pointer; } -//---------------------------------------------------------------------------- cmTargetInternalPointer& cmTargetInternalPointer::operator=(cmTargetInternalPointer const& r) { diff --git a/Source/cmTargetCompileDefinitionsCommand.cxx b/Source/cmTargetCompileDefinitionsCommand.cxx index 394a166..e50e783 100644 --- a/Source/cmTargetCompileDefinitionsCommand.cxx +++ b/Source/cmTargetCompileDefinitionsCommand.cxx @@ -37,7 +37,6 @@ void cmTargetCompileDefinitionsCommand this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- std::string cmTargetCompileDefinitionsCommand ::Join(const std::vector<std::string> &content) { @@ -59,7 +58,6 @@ std::string cmTargetCompileDefinitionsCommand return defs; } -//---------------------------------------------------------------------------- bool cmTargetCompileDefinitionsCommand ::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content, bool, bool) diff --git a/Source/cmTargetCompileFeaturesCommand.cxx b/Source/cmTargetCompileFeaturesCommand.cxx index 823afa1..4bc8181 100644 --- a/Source/cmTargetCompileFeaturesCommand.cxx +++ b/Source/cmTargetCompileFeaturesCommand.cxx @@ -38,14 +38,12 @@ void cmTargetCompileFeaturesCommand this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- std::string cmTargetCompileFeaturesCommand ::Join(const std::vector<std::string> &content) { return cmJoin(content, ";"); } -//---------------------------------------------------------------------------- bool cmTargetCompileFeaturesCommand ::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content, bool, bool) diff --git a/Source/cmTargetCompileOptionsCommand.cxx b/Source/cmTargetCompileOptionsCommand.cxx index 8e86f0f..d7c19c8 100644 --- a/Source/cmTargetCompileOptionsCommand.cxx +++ b/Source/cmTargetCompileOptionsCommand.cxx @@ -37,14 +37,12 @@ void cmTargetCompileOptionsCommand this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- std::string cmTargetCompileOptionsCommand ::Join(const std::vector<std::string> &content) { return cmJoin(content, ";"); } -//---------------------------------------------------------------------------- bool cmTargetCompileOptionsCommand ::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content, bool, bool) diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx index 7dfe9ca..01d9164 100644 --- a/Source/cmTargetIncludeDirectoriesCommand.cxx +++ b/Source/cmTargetIncludeDirectoriesCommand.cxx @@ -13,7 +13,6 @@ #include "cmGeneratorExpression.h" -//---------------------------------------------------------------------------- bool cmTargetIncludeDirectoriesCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { @@ -21,7 +20,6 @@ bool cmTargetIncludeDirectoriesCommand ArgumentFlags(PROCESS_BEFORE | PROCESS_SYSTEM)); } -//---------------------------------------------------------------------------- void cmTargetIncludeDirectoriesCommand ::HandleImportedTarget(const std::string &tgt) { @@ -31,7 +29,6 @@ void cmTargetIncludeDirectoriesCommand this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- void cmTargetIncludeDirectoriesCommand ::HandleMissingTarget(const std::string &name) { @@ -41,7 +38,6 @@ void cmTargetIncludeDirectoriesCommand this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- std::string cmTargetIncludeDirectoriesCommand ::Join(const std::vector<std::string> &content) { @@ -66,7 +62,6 @@ std::string cmTargetIncludeDirectoriesCommand return dirs; } -//---------------------------------------------------------------------------- bool cmTargetIncludeDirectoriesCommand ::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content, bool prepend, bool system) @@ -96,7 +91,6 @@ bool cmTargetIncludeDirectoriesCommand return true; } -//---------------------------------------------------------------------------- void cmTargetIncludeDirectoriesCommand ::HandleInterfaceContent(cmTarget *tgt, const std::vector<std::string> &content, diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h index 2a7814e..14d1d1e 100644 --- a/Source/cmTargetIncludeDirectoriesCommand.h +++ b/Source/cmTargetIncludeDirectoriesCommand.h @@ -15,7 +15,6 @@ #include "cmTargetPropCommandBase.h" -//---------------------------------------------------------------------------- class cmTargetIncludeDirectoriesCommand : public cmTargetPropCommandBase { public: diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 435346a..04f0b45 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -334,7 +334,6 @@ bool cmTargetLinkLibrariesCommand return true; } -//---------------------------------------------------------------------------- void cmTargetLinkLibrariesCommand ::LinkLibraryTypeSpecifierWarning(int left, int right) @@ -347,7 +346,6 @@ cmTargetLinkLibrariesCommand this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str()); } -//---------------------------------------------------------------------------- bool cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib, cmTargetLinkLibraryType llt) diff --git a/Source/cmTargetPropCommandBase.cxx b/Source/cmTargetPropCommandBase.cxx index bfc19a4..0c51b71 100644 --- a/Source/cmTargetPropCommandBase.cxx +++ b/Source/cmTargetPropCommandBase.cxx @@ -14,7 +14,6 @@ #include "cmGlobalGenerator.h" -//---------------------------------------------------------------------------- bool cmTargetPropCommandBase ::HandleArguments(std::vector<std::string> const& args, const std::string& prop, @@ -93,7 +92,6 @@ bool cmTargetPropCommandBase return true; } -//---------------------------------------------------------------------------- bool cmTargetPropCommandBase ::ProcessContentArgs(std::vector<std::string> const& args, unsigned int &argIndex, bool prepend, bool system) @@ -139,7 +137,6 @@ bool cmTargetPropCommandBase return this->PopulateTargetProperies(scope, content, prepend, system); } -//---------------------------------------------------------------------------- bool cmTargetPropCommandBase ::PopulateTargetProperies(const std::string &scope, const std::vector<std::string> &content, @@ -159,7 +156,6 @@ bool cmTargetPropCommandBase return true; } -//---------------------------------------------------------------------------- void cmTargetPropCommandBase::HandleInterfaceContent(cmTarget *tgt, const std::vector<std::string> &content, bool prepend, bool) diff --git a/Source/cmTargetPropCommandBase.h b/Source/cmTargetPropCommandBase.h index d42b588..4f1f108 100644 --- a/Source/cmTargetPropCommandBase.h +++ b/Source/cmTargetPropCommandBase.h @@ -17,7 +17,6 @@ class cmTarget; -//---------------------------------------------------------------------------- class cmTargetPropCommandBase : public cmCommand { public: diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx index 0a44d6f..390ba38 100644 --- a/Source/cmTargetSourcesCommand.cxx +++ b/Source/cmTargetSourcesCommand.cxx @@ -13,14 +13,12 @@ #include "cmGeneratorExpression.h" -//---------------------------------------------------------------------------- bool cmTargetSourcesCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { return this->HandleArguments(args, "SOURCES"); } -//---------------------------------------------------------------------------- void cmTargetSourcesCommand ::HandleImportedTarget(const std::string &tgt) { @@ -30,7 +28,6 @@ void cmTargetSourcesCommand this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- void cmTargetSourcesCommand ::HandleMissingTarget(const std::string &name) { @@ -40,14 +37,12 @@ void cmTargetSourcesCommand this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str()); } -//---------------------------------------------------------------------------- std::string cmTargetSourcesCommand ::Join(const std::vector<std::string> &content) { return cmJoin(content, ";"); } -//---------------------------------------------------------------------------- bool cmTargetSourcesCommand ::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content, bool, bool) diff --git a/Source/cmTargetSourcesCommand.h b/Source/cmTargetSourcesCommand.h index a170e36..3768f30 100644 --- a/Source/cmTargetSourcesCommand.h +++ b/Source/cmTargetSourcesCommand.h @@ -15,7 +15,6 @@ #include "cmTargetPropCommandBase.h" -//---------------------------------------------------------------------------- class cmTargetSourcesCommand : public cmTargetPropCommandBase { public: diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx index 7182122..ec61ec6 100644 --- a/Source/cmTest.cxx +++ b/Source/cmTest.cxx @@ -16,7 +16,6 @@ #include "cmMakefile.h" #include "cmake.h" -//---------------------------------------------------------------------------- cmTest::cmTest(cmMakefile* mf) : Backtrace(mf->GetBacktrace()) { @@ -24,30 +23,25 @@ cmTest::cmTest(cmMakefile* mf) this->OldStyle = true; } -//---------------------------------------------------------------------------- cmTest::~cmTest() { } -//---------------------------------------------------------------------------- cmListFileBacktrace const& cmTest::GetBacktrace() const { return this->Backtrace; } -//---------------------------------------------------------------------------- void cmTest::SetName(const std::string& name) { this->Name = name; } -//---------------------------------------------------------------------------- void cmTest::SetCommand(std::vector<std::string> const& command) { this->Command = command; } -//---------------------------------------------------------------------------- const char *cmTest::GetProperty(const std::string& prop) const { const char *retVal = this->Properties.GetPropertyValue(prop); @@ -63,19 +57,16 @@ const char *cmTest::GetProperty(const std::string& prop) const return retVal; } -//---------------------------------------------------------------------------- bool cmTest::GetPropertyAsBool(const std::string& prop) const { return cmSystemTools::IsOn(this->GetProperty(prop)); } -//---------------------------------------------------------------------------- void cmTest::SetProperty(const std::string& prop, const char* value) { this->Properties.SetProperty(prop, value); } -//---------------------------------------------------------------------------- void cmTest::AppendProperty(const std::string& prop, const char* value, bool asString) { diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx index 5790fa6..42e8090 100644 --- a/Source/cmTestGenerator.cxx +++ b/Source/cmTestGenerator.cxx @@ -17,7 +17,6 @@ #include "cmSystemTools.h" #include "cmTest.h" -//---------------------------------------------------------------------------- cmTestGenerator ::cmTestGenerator(cmTest* test, std::vector<std::string> const& configurations): @@ -29,7 +28,6 @@ cmTestGenerator this->LG = 0; } -//---------------------------------------------------------------------------- cmTestGenerator ::~cmTestGenerator() { @@ -40,7 +38,6 @@ void cmTestGenerator::Compute(cmLocalGenerator* lg) this->LG = lg; } -//---------------------------------------------------------------------------- void cmTestGenerator::GenerateScriptConfigs(std::ostream& os, Indent const& indent) { @@ -48,7 +45,6 @@ void cmTestGenerator::GenerateScriptConfigs(std::ostream& os, this->cmScriptGenerator::GenerateScriptConfigs(os, indent); } -//---------------------------------------------------------------------------- void cmTestGenerator::GenerateScriptActions(std::ostream& os, Indent const& indent) { @@ -67,7 +63,6 @@ void cmTestGenerator::GenerateScriptActions(std::ostream& os, } } -//---------------------------------------------------------------------------- void cmTestGenerator::GenerateScriptForConfig(std::ostream& os, const std::string& config, Indent const& indent) @@ -150,14 +145,12 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os, } } -//---------------------------------------------------------------------------- void cmTestGenerator::GenerateScriptNoConfig(std::ostream& os, Indent const& indent) { os << indent << "add_test(" << this->Test->GetName() << " NOT_AVAILABLE)\n"; } -//---------------------------------------------------------------------------- bool cmTestGenerator::NeedsScriptNoConfig() const { return (this->TestGenerated && // test generated for at least one config @@ -166,7 +159,6 @@ bool cmTestGenerator::NeedsScriptNoConfig() const !this->ConfigurationTypes->empty()); // config-dependent command } -//---------------------------------------------------------------------------- void cmTestGenerator::GenerateOldStyle(std::ostream& fout, Indent const& indent) { diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index b5c9d8e..90bc4de 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -19,7 +19,6 @@ // include sys/stat.h after sys/types.h #include <sys/stat.h> -//---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( const std::string& formatString, bool utcFlag) { @@ -32,7 +31,6 @@ std::string cmTimestamp::CurrentTime( return CreateTimestampFromTimeT(currentTimeT, formatString, utcFlag); } -//---------------------------------------------------------------------------- std::string cmTimestamp::FileModificationTime(const char* path, const std::string& formatString, bool utcFlag) { @@ -45,7 +43,6 @@ std::string cmTimestamp::FileModificationTime(const char* path, return CreateTimestampFromTimeT(mtime, formatString, utcFlag); } -//---------------------------------------------------------------------------- std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, std::string formatString, bool utcFlag) const { @@ -99,7 +96,6 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, return result; } -//---------------------------------------------------------------------------- time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const { #if defined(_MSC_VER) && _MSC_VER >= 1400 @@ -131,7 +127,6 @@ time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const #endif } -//---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( char flag, struct tm& timeStruct, const time_t timeT) const { diff --git a/Source/cmVariableWatchCommand.cxx b/Source/cmVariableWatchCommand.cxx index 98a397c..b776626 100644 --- a/Source/cmVariableWatchCommand.cxx +++ b/Source/cmVariableWatchCommand.cxx @@ -13,14 +13,12 @@ #include "cmVariableWatch.h" -//---------------------------------------------------------------------------- struct cmVariableWatchCallbackData { bool InCallback; std::string Command; }; -//---------------------------------------------------------------------------- static void cmVariableWatchCommandVariableAccessed( const std::string& variable, int access_type, void* client_data, const char* newValue, const cmMakefile* mf) @@ -88,7 +86,6 @@ static void cmVariableWatchCommandVariableAccessed( data->InCallback = false; } -//---------------------------------------------------------------------------- static void deleteVariableWatchCallbackData(void* client_data) { cmVariableWatchCallbackData* data @@ -96,12 +93,10 @@ static void deleteVariableWatchCallbackData(void* client_data) delete data; } -//---------------------------------------------------------------------------- cmVariableWatchCommand::cmVariableWatchCommand() { } -//---------------------------------------------------------------------------- cmVariableWatchCommand::~cmVariableWatchCommand() { std::set<std::string>::const_iterator it; @@ -114,7 +109,6 @@ cmVariableWatchCommand::~cmVariableWatchCommand() } } -//---------------------------------------------------------------------------- bool cmVariableWatchCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 65c23ca..51e7999 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -759,7 +759,6 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues() } } -//---------------------------------------------------------------------------- void cmVisualStudio10TargetGenerator ::WriteMSToolConfigurationValues(std::string const& config) { @@ -819,7 +818,6 @@ void cmVisualStudio10TargetGenerator } } -//---------------------------------------------------------------------------- void cmVisualStudio10TargetGenerator ::WriteNsightTegraConfigurationValues(std::string const&) { @@ -873,7 +871,6 @@ void cmVisualStudio10TargetGenerator::WriteCustomCommands() } } -//---------------------------------------------------------------------------- void cmVisualStudio10TargetGenerator ::WriteCustomCommand(cmSourceFile const* sf) { @@ -1920,7 +1917,6 @@ OutputLinkIncremental(std::string const& configName) } } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeClOptions() { for(std::vector<std::string>::const_iterator @@ -1935,7 +1931,6 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions() return true; } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeClOptions( std::string const& configName) { @@ -2051,7 +2046,6 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( return true; } -//---------------------------------------------------------------------------- void cmVisualStudio10TargetGenerator::WriteClOptions( std::string const& configName, std::vector<std::string> const& includes) @@ -2115,7 +2109,6 @@ void cmVisualStudio10TargetGenerator::WriteClOptions( this->WriteString("</ClCompile>\n", 2); } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeRcOptions() { for(std::vector<std::string>::const_iterator @@ -2130,7 +2123,6 @@ bool cmVisualStudio10TargetGenerator::ComputeRcOptions() return true; } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeRcOptions( std::string const& configName) { @@ -2176,7 +2168,6 @@ WriteRCOptions(std::string const& configName, this->WriteString("</ResourceCompile>\n", 2); } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeMasmOptions() { if(!this->GlobalGenerator->IsMasmEnabled()) @@ -2195,7 +2186,6 @@ bool cmVisualStudio10TargetGenerator::ComputeMasmOptions() return true; } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeMasmOptions( std::string const& configName) { @@ -2306,7 +2296,6 @@ void cmVisualStudio10TargetGenerator::WriteManifestOptions( } } -//---------------------------------------------------------------------------- void cmVisualStudio10TargetGenerator::WriteAntBuildOptions( std::string const& configName) { @@ -2446,7 +2435,6 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions( this->WriteString("</AntBuild>\n", 2); } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeLinkOptions() { if(this->GeneratorTarget->GetType() == cmState::EXECUTABLE || @@ -2466,7 +2454,6 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions() return true; } -//---------------------------------------------------------------------------- bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config) { @@ -2750,7 +2737,6 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config) return true; } -//---------------------------------------------------------------------------- void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& config) { diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 142e36f..00374e8 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -25,7 +25,6 @@ std::string cmVisualStudioGeneratorOptionsEscapeForXML(std::string ret) return ret; } -//---------------------------------------------------------------------------- cmVisualStudioGeneratorOptions ::cmVisualStudioGeneratorOptions(cmLocalVisualStudioGenerator* lg, Tool tool, @@ -45,7 +44,6 @@ cmVisualStudioGeneratorOptions this->FortranRuntimeMT = false; } -//---------------------------------------------------------------------------- cmVisualStudioGeneratorOptions ::cmVisualStudioGeneratorOptions(cmLocalVisualStudioGenerator* lg, Tool tool, @@ -71,7 +69,6 @@ cmVisualStudioGeneratorOptions this->FortranRuntimeMT = false; } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions::AddTable(cmVS7FlagTable const* table) { if(table) @@ -87,7 +84,6 @@ void cmVisualStudioGeneratorOptions::AddTable(cmVS7FlagTable const* table) } } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions::FixExceptionHandlingDefault() { // Exception handling is on by default because the platform file has @@ -117,7 +113,6 @@ void cmVisualStudioGeneratorOptions::FixExceptionHandlingDefault() } } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions::SetVerboseMakefile(bool verbose) { // If verbose makefiles have been requested and the /nologo option @@ -142,13 +137,11 @@ bool cmVisualStudioGeneratorOptions::IsDebug() const return this->FlagMap.find("DebugInformationFormat") != this->FlagMap.end(); } -//---------------------------------------------------------------------------- bool cmVisualStudioGeneratorOptions::IsWinRt() const { return this->FlagMap.find("CompileAsWinRT") != this->FlagMap.end(); } -//---------------------------------------------------------------------------- bool cmVisualStudioGeneratorOptions::UsingUnicode() const { // Look for the a _UNICODE definition. @@ -162,7 +155,6 @@ bool cmVisualStudioGeneratorOptions::UsingUnicode() const } return false; } -//---------------------------------------------------------------------------- bool cmVisualStudioGeneratorOptions::UsingSBCS() const { // Look for the a _SBCS definition. @@ -177,7 +169,6 @@ bool cmVisualStudioGeneratorOptions::UsingSBCS() const return false; } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions::Parse(const char* flags) { // Parse the input string as a windows command line since the string @@ -194,7 +185,6 @@ void cmVisualStudioGeneratorOptions::Parse(const char* flags) } } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions::ParseFinish() { if(this->CurrentTool == FortranCompiler) @@ -216,7 +206,6 @@ void cmVisualStudioGeneratorOptions::ParseFinish() } } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions::StoreUnknownFlag(const char* flag) { // Look for Intel Fortran flags that do not map well in the flag table. @@ -253,13 +242,11 @@ void cmVisualStudioGeneratorOptions::StoreUnknownFlag(const char* flag) cmOutputConverter::Shell_Flag_VSIDE); } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions::SetConfiguration(const char* config) { this->Configuration = config; } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions ::OutputPreprocessorDefinitions(std::ostream& fout, @@ -336,7 +323,6 @@ cmVisualStudioGeneratorOptions } } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions ::OutputFlagMap(std::ostream& fout, const char* indent) @@ -387,7 +373,6 @@ cmVisualStudioGeneratorOptions } } -//---------------------------------------------------------------------------- void cmVisualStudioGeneratorOptions ::OutputAdditionalOptions(std::ostream& fout, diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h index 0179134..e5633be 100644 --- a/Source/cmVisualStudioGeneratorOptions.h +++ b/Source/cmVisualStudioGeneratorOptions.h @@ -19,7 +19,6 @@ typedef cmIDEFlagTable cmVS7FlagTable; class cmVisualStudio10TargetGenerator; -//---------------------------------------------------------------------------- class cmVisualStudioGeneratorOptions: public cmIDEOptions { public: diff --git a/Source/cmVisualStudioSlnData.cxx b/Source/cmVisualStudioSlnData.cxx index 82b4ee8..6d7c5ce 100644 --- a/Source/cmVisualStudioSlnData.cxx +++ b/Source/cmVisualStudioSlnData.cxx @@ -11,7 +11,6 @@ ============================================================================*/ #include "cmVisualStudioSlnData.h" -//---------------------------------------------------------------------------- const cmSlnProjectEntry* cmSlnData::GetProjectByGUID(const std::string& projectGUID) const { @@ -22,7 +21,6 @@ cmSlnData::GetProjectByGUID(const std::string& projectGUID) const return NULL; } -//---------------------------------------------------------------------------- const cmSlnProjectEntry* cmSlnData::GetProjectByName(const std::string& projectName) const { @@ -33,7 +31,6 @@ cmSlnData::GetProjectByName(const std::string& projectName) const return NULL; } -//---------------------------------------------------------------------------- std::vector<cmSlnProjectEntry> cmSlnData::GetProjects() const { ProjectStringIndex::const_iterator it(this->ProjectNameIndex.begin()), @@ -44,7 +41,6 @@ std::vector<cmSlnProjectEntry> cmSlnData::GetProjects() const return result; } -//---------------------------------------------------------------------------- cmSlnProjectEntry* cmSlnData::AddProject( const std::string& projectGUID, const std::string& projectName, diff --git a/Source/cmVisualStudioSlnParser.cxx b/Source/cmVisualStudioSlnParser.cxx index d182a75..2bbea55 100644 --- a/Source/cmVisualStudioSlnParser.cxx +++ b/Source/cmVisualStudioSlnParser.cxx @@ -18,7 +18,6 @@ #include <cassert> #include <stack> -//---------------------------------------------------------------------------- namespace { enum LineFormat @@ -30,7 +29,6 @@ namespace }; } -//---------------------------------------------------------------------------- class cmVisualStudioSlnParser::ParsedLine { public: @@ -64,25 +62,21 @@ private: static const std::string Quote; }; -//---------------------------------------------------------------------------- const std::string cmVisualStudioSlnParser::ParsedLine::BadString; const std::string cmVisualStudioSlnParser::ParsedLine::Quote("\""); -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParsedLine::IsComment() const { assert(!this->Tag.empty()); return (this->Tag[0]== '#'); } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParsedLine::IsKeyValuePair() const { assert(!this->Tag.empty()); return this->Arg.first.empty() && this->Values.size() == 1; } -//---------------------------------------------------------------------------- std::string cmVisualStudioSlnParser::ParsedLine::GetArgVerbatim() const { if (this->Arg.second) @@ -91,7 +85,6 @@ std::string cmVisualStudioSlnParser::ParsedLine::GetArgVerbatim() const return this->Arg.first; } -//---------------------------------------------------------------------------- const std::string& cmVisualStudioSlnParser::ParsedLine::GetValue(size_t idxValue) const { @@ -101,7 +94,6 @@ cmVisualStudioSlnParser::ParsedLine::GetValue(size_t idxValue) const return BadString; } -//---------------------------------------------------------------------------- std::string cmVisualStudioSlnParser::ParsedLine::GetValueVerbatim(size_t idxValue) const { @@ -117,7 +109,6 @@ cmVisualStudioSlnParser::ParsedLine::GetValueVerbatim(size_t idxValue) const return BadString; } -//---------------------------------------------------------------------------- class cmVisualStudioSlnParser::State { public: @@ -156,7 +147,6 @@ private: void IgnoreUntilTag(const std::string& endTag); }; -//---------------------------------------------------------------------------- cmVisualStudioSlnParser::State::State(DataGroupSet requestedData) : RequestedData(requestedData), CurrentLine(0) @@ -166,7 +156,6 @@ cmVisualStudioSlnParser::State::State(DataGroupSet requestedData) : this->Stack.push(FileStateStart); } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::State::ReadLine(std::istream& input, std::string& line) { @@ -174,7 +163,6 @@ bool cmVisualStudioSlnParser::State::ReadLine(std::istream& input, return !std::getline(input, line).fail(); } -//---------------------------------------------------------------------------- LineFormat cmVisualStudioSlnParser::State::NextLineFormat() const { switch (this->Stack.top()) @@ -195,7 +183,6 @@ LineFormat cmVisualStudioSlnParser::State::NextLineFormat() const } } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::State::Process( const cmVisualStudioSlnParser::ParsedLine& line, cmSlnData& output, cmVisualStudioSlnParser::ResultData& result) @@ -379,7 +366,6 @@ bool cmVisualStudioSlnParser::State::Process( return true; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::State::Finished( cmVisualStudioSlnParser::ResultData& result) { @@ -392,26 +378,22 @@ bool cmVisualStudioSlnParser::State::Finished( return true; } -//---------------------------------------------------------------------------- void cmVisualStudioSlnParser::State::IgnoreUntilTag(const std::string& endTag) { this->Stack.push(FileStateIgnore); this->EndIgnoreTag = endTag; } -//---------------------------------------------------------------------------- cmVisualStudioSlnParser::ResultData::ResultData() : Result(ResultOK) , ResultLine(0) {} -//---------------------------------------------------------------------------- void cmVisualStudioSlnParser::ResultData::Clear() { *this = ResultData(); } -//---------------------------------------------------------------------------- void cmVisualStudioSlnParser::ResultData::SetError(ParseResult error, size_t line) { @@ -419,7 +401,6 @@ void cmVisualStudioSlnParser::ResultData::SetError(ParseResult error, this->ResultLine = line; } -//---------------------------------------------------------------------------- const cmVisualStudioSlnParser::DataGroupSet cmVisualStudioSlnParser::DataGroupProjects( 1 << cmVisualStudioSlnParser::DataGroupProjectsBit); @@ -447,7 +428,6 @@ cmVisualStudioSlnParser::DataGroupGenericGlobalSections( const cmVisualStudioSlnParser::DataGroupSet cmVisualStudioSlnParser::DataGroupAll(~0); -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::Parse(std::istream& input, cmSlnData& output, DataGroupSet dataGroups) @@ -462,7 +442,6 @@ bool cmVisualStudioSlnParser::Parse(std::istream& input, return this->ParseImpl(input, output, state); } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseFile(const std::string& file, cmSlnData& output, DataGroupSet dataGroups) @@ -483,26 +462,22 @@ bool cmVisualStudioSlnParser::ParseFile(const std::string& file, return this->ParseImpl(f, output, state); } -//---------------------------------------------------------------------------- cmVisualStudioSlnParser::ParseResult cmVisualStudioSlnParser::GetParseResult() const { return this->LastResult.Result; } -//---------------------------------------------------------------------------- size_t cmVisualStudioSlnParser::GetParseResultLine() const { return this->LastResult.ResultLine; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::GetParseHadBOM() const { return this->LastResult.HadBOM; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::IsDataGroupSetSupported(DataGroupSet dataGroups) const { @@ -510,7 +485,6 @@ cmVisualStudioSlnParser::IsDataGroupSetSupported(DataGroupSet dataGroups) const //only supporting DataGroupProjects for now } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseImpl(std::istream& input, cmSlnData& output, State& state) @@ -552,7 +526,6 @@ bool cmVisualStudioSlnParser::ParseImpl(std::istream& input, return state.Finished(this->LastResult); } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseBOM(std::istream& input, std::string& line, State& state) @@ -575,7 +548,6 @@ bool cmVisualStudioSlnParser::ParseBOM(std::istream& input, return true; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseMultiValueTag(const std::string& line, ParsedLine& parsedLine, State& state) @@ -626,7 +598,6 @@ bool cmVisualStudioSlnParser::ParseMultiValueTag(const std::string& line, return true; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseSingleValueTag(const std::string& line, ParsedLine& parsedLine, State& state) @@ -643,7 +614,6 @@ bool cmVisualStudioSlnParser::ParseSingleValueTag(const std::string& line, return true; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseKeyValuePair(const std::string& line, ParsedLine& parsedLine, State& /*state*/) @@ -661,7 +631,6 @@ bool cmVisualStudioSlnParser::ParseKeyValuePair(const std::string& line, return true; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseTag(const std::string& fullTag, ParsedLine& parsedLine, State& state) @@ -698,7 +667,6 @@ bool cmVisualStudioSlnParser::ParseTag(const std::string& fullTag, return true; } -//---------------------------------------------------------------------------- bool cmVisualStudioSlnParser::ParseValue(const std::string& value, ParsedLine& parsedLine) { diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx index bd055e5..b47e302 100644 --- a/Source/cmXCode21Object.cxx +++ b/Source/cmXCode21Object.cxx @@ -13,14 +13,12 @@ #include "cmSystemTools.h" -//---------------------------------------------------------------------------- cmXCode21Object::cmXCode21Object(PBXType ptype, Type type) :cmXCodeObject(ptype, type) { this->Version = 21; } -//---------------------------------------------------------------------------- void cmXCode21Object::PrintComment(std::ostream& out) { if(this->Comment.empty()) @@ -41,7 +39,6 @@ void cmXCode21Object::PrintComment(std::ostream& out) out << " */"; } -//---------------------------------------------------------------------------- void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v, std::ostream& out, PBXType t) { @@ -73,7 +70,6 @@ void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v, out << "/* End " << PBXTypeNames[t] << " section */\n"; } -//---------------------------------------------------------------------------- void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v, std::ostream& out) { diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index e7d18b7..6a6c253 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -15,7 +15,6 @@ #include <CoreFoundation/CoreFoundation.h> // CFUUIDCreate -//---------------------------------------------------------------------------- const char* cmXCodeObject::PBXTypeNames[] = { /* clang-format needs this comment to break after the opening brace */ "PBXGroup", "PBXBuildStyle", "PBXProject", "PBXHeadersBuildPhase", @@ -30,13 +29,11 @@ const char* cmXCodeObject::PBXTypeNames[] = { "None" }; -//---------------------------------------------------------------------------- cmXCodeObject::~cmXCodeObject() { this->Version = 15; } -//---------------------------------------------------------------------------- cmXCodeObject::cmXCodeObject(PBXType ptype, Type type) { this->Version = 15; @@ -78,7 +75,6 @@ cmXCodeObject::cmXCodeObject(PBXType ptype, Type type) } } -//---------------------------------------------------------------------------- void cmXCodeObject::Indent(int level, std::ostream& out) { while(level) @@ -88,7 +84,6 @@ void cmXCodeObject::Indent(int level, std::ostream& out) } } -//---------------------------------------------------------------------------- void cmXCodeObject::Print(std::ostream& out) { std::string separator = "\n"; @@ -211,7 +206,6 @@ void cmXCodeObject::PrintAttribute(std::ostream& out, const int level, } } -//---------------------------------------------------------------------------- void cmXCodeObject::PrintList(std::vector<cmXCodeObject*> const& objs, std::ostream& out) { @@ -228,7 +222,6 @@ void cmXCodeObject::PrintList(std::vector<cmXCodeObject*> const& objs, out << "};\n"; } -//---------------------------------------------------------------------------- void cmXCodeObject::CopyAttributes(cmXCodeObject* copy) { this->ObjectAttributes = copy->ObjectAttributes; @@ -237,7 +230,6 @@ void cmXCodeObject::CopyAttributes(cmXCodeObject* copy) this->Object = copy->Object; } -//---------------------------------------------------------------------------- void cmXCodeObject::PrintString(std::ostream& os,std::string String) { // The string needs to be quoted if it contains any characters @@ -272,7 +264,6 @@ void cmXCodeObject::PrintString(std::ostream& os) const cmXCodeObject::PrintString(os,this->String); } -//---------------------------------------------------------------------------- void cmXCodeObject::SetString(const std::string& s) { this->String = s; diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx index 6a24faa..e2f7afa 100644 --- a/Source/cmXMLParser.cxx +++ b/Source/cmXMLParser.cxx @@ -16,7 +16,6 @@ #include <cm_expat.h> #include <ctype.h> -//---------------------------------------------------------------------------- cmXMLParser::cmXMLParser() { this->Parser = 0; @@ -25,7 +24,6 @@ cmXMLParser::cmXMLParser() this->ReportCallbackData = 0; } -//---------------------------------------------------------------------------- cmXMLParser::~cmXMLParser() { if ( this->Parser ) @@ -34,7 +32,6 @@ cmXMLParser::~cmXMLParser() } } -//---------------------------------------------------------------------------- int cmXMLParser::Parse(const char* string) { return (int)this->InitializeParser() && @@ -60,7 +57,6 @@ int cmXMLParser::ParseFile(const char* file) return this->Parse(str.str().c_str()); } -//---------------------------------------------------------------------------- int cmXMLParser::InitializeParser() { if ( this->Parser ) @@ -82,7 +78,6 @@ int cmXMLParser::InitializeParser() return 1; } -//---------------------------------------------------------------------------- int cmXMLParser::ParseChunk(const char* inputString, std::string::size_type length) { @@ -101,7 +96,6 @@ int cmXMLParser::ParseChunk(const char* inputString, return res; } -//---------------------------------------------------------------------------- int cmXMLParser::CleanupParser() { if ( !this->Parser ) @@ -128,7 +122,6 @@ int cmXMLParser::CleanupParser() return result; } -//---------------------------------------------------------------------------- int cmXMLParser::ParseBuffer(const char* buffer, std::string::size_type count) { // Pass the buffer to the expat XML parser. @@ -141,45 +134,38 @@ int cmXMLParser::ParseBuffer(const char* buffer, std::string::size_type count) return 1; } -//---------------------------------------------------------------------------- int cmXMLParser::ParseBuffer(const char* buffer) { return this->ParseBuffer(buffer, static_cast<int>(strlen(buffer))); } -//---------------------------------------------------------------------------- int cmXMLParser::ParsingComplete() { // Default behavior is to parse to end of stream. return 0; } -//---------------------------------------------------------------------------- void cmXMLParser::StartElement(const std::string& name, const char ** /*atts*/) { std::cout << "Start element: " << name << std::endl; } -//---------------------------------------------------------------------------- void cmXMLParser::EndElement(const std::string& name) { std::cout << "End element: " << name << std::endl; } -//---------------------------------------------------------------------------- void cmXMLParser::CharacterDataHandler(const char* /*inData*/, int /*inLength*/) { } -//---------------------------------------------------------------------------- int cmXMLParser::IsSpace(char c) { return isspace(c); } -//---------------------------------------------------------------------------- const char* cmXMLParser::FindAttribute(const char** atts, const char* attribute) { @@ -196,7 +182,6 @@ const char* cmXMLParser::FindAttribute(const char** atts, return 0; } -//---------------------------------------------------------------------------- void cmXMLParserStartElement(void* parser, const char *name, const char **atts) { @@ -206,7 +191,6 @@ void cmXMLParserStartElement(void* parser, const char *name, static_cast<cmXMLParser*>(parser)->StartElement(name, atts); } -//---------------------------------------------------------------------------- void cmXMLParserEndElement(void* parser, const char *name) { // End element handler that is registered with the XML_Parser. This @@ -214,7 +198,6 @@ void cmXMLParserEndElement(void* parser, const char *name) static_cast<cmXMLParser*>(parser)->EndElement(name); } -//---------------------------------------------------------------------------- void cmXMLParserCharacterDataHandler(void* parser, const char* data, int length) { @@ -224,7 +207,6 @@ void cmXMLParserCharacterDataHandler(void* parser, const char* data, static_cast<cmXMLParser*>(parser)->CharacterDataHandler(data, length); } -//---------------------------------------------------------------------------- void cmXMLParser::ReportXmlParseError() { XML_Parser parser = static_cast<XML_Parser>(this->Parser); @@ -233,7 +215,6 @@ void cmXMLParser::ReportXmlParseError() XML_ErrorString(XML_GetErrorCode(parser))); } -//---------------------------------------------------------------------------- void cmXMLParser::ReportError(int line, int, const char* msg) { if(this->ReportCallback) diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx index e76ee52..0a76e9d 100644 --- a/Source/cmXMLSafe.cxx +++ b/Source/cmXMLSafe.cxx @@ -19,7 +19,6 @@ #include <stdio.h> #include <string.h> -//---------------------------------------------------------------------------- cmXMLSafe::cmXMLSafe(const char* s): Data(s), Size(static_cast<unsigned long>(strlen(s))), @@ -27,7 +26,6 @@ cmXMLSafe::cmXMLSafe(const char* s): { } -//---------------------------------------------------------------------------- cmXMLSafe::cmXMLSafe(std::string const& s): Data(s.c_str()), Size(static_cast<unsigned long>(s.length())), @@ -35,14 +33,12 @@ cmXMLSafe::cmXMLSafe(std::string const& s): { } -//---------------------------------------------------------------------------- cmXMLSafe& cmXMLSafe::Quotes(bool b) { this->DoQuotes = b; return *this; } -//---------------------------------------------------------------------------- std::string cmXMLSafe::str() { std::ostringstream ss; @@ -50,7 +46,6 @@ std::string cmXMLSafe::str() return ss.str(); } -//---------------------------------------------------------------------------- std::ostream& operator<<(std::ostream& os, cmXMLSafe const& self) { char const* first = self.Data; diff --git a/Source/cm_utf8.c b/Source/cm_utf8.c index c9bf259..6f5fa3a 100644 --- a/Source/cm_utf8.c +++ b/Source/cm_utf8.c @@ -45,7 +45,6 @@ static unsigned int const cm_utf8_min[7] = { 0, 0, 1u<<7, 1u<<11, 1u<<16, 1u<<21, 1u<<26 /*, 1u<<31 */ }; -/*--------------------------------------------------------------------------*/ const char* cm_utf8_decode_character(const char* first, const char* last, unsigned int* pc) { diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 3319af1..3fd35fb 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -814,7 +814,6 @@ void cmake::SetArgs(const std::vector<std::string>& args, } } -//---------------------------------------------------------------------------- void cmake::SetDirectoriesFromFile(const char* arg) { // Check if the argument refers to a CMakeCache.txt or @@ -1004,7 +1003,6 @@ void cmake::AddDefaultExtraGenerators() } -//---------------------------------------------------------------------------- void cmake::GetRegisteredGenerators(std::vector<GeneratorInfo>& generators) { for (RegisteredGeneratorsVector::const_iterator @@ -2029,7 +2027,6 @@ void cmake::UpdateConversionPathTable() } } -//---------------------------------------------------------------------------- int cmake::CheckBuildSystem() { // We do not need to rerun CMake. Check dependency integrity. Use @@ -2233,7 +2230,6 @@ int cmake::CheckBuildSystem() return 0; } -//---------------------------------------------------------------------------- void cmake::TruncateOutputLog(const char* fname) { std::string fullPath = this->GetHomeOutputDirectory(); @@ -2481,7 +2477,6 @@ int cmake::GetSystemInformation(std::vector<std::string>& args) return 0; } -//---------------------------------------------------------------------------- static bool cmakeCheckStampFile(const char* stampName) { // The stamp file does not exist. Use the stamp dependencies to @@ -2555,7 +2550,6 @@ static bool cmakeCheckStampFile(const char* stampName) } } -//---------------------------------------------------------------------------- static bool cmakeCheckStampList(const char* stampList) { // If the stamp list does not exist CMake must rerun to generate it. @@ -2749,7 +2743,6 @@ void displayMessage(cmake::MessageType t, std::ostringstream& msg) } } -//---------------------------------------------------------------------------- void cmake::IssueMessage(cmake::MessageType t, std::string const& text, cmListFileBacktrace const& bt, bool force) @@ -2789,7 +2782,6 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text, displayMessage(t, msg); } -//---------------------------------------------------------------------------- std::vector<std::string> cmake::GetDebugConfigs() { std::vector<std::string> configs; diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index d8207fa..5f086d5 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -28,7 +28,6 @@ #include <cmsys/Encoding.hxx> #ifdef CMAKE_BUILD_WITH_CMAKE -//---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = { {0, @@ -36,7 +35,6 @@ static const char * cmDocumentationName[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsage[][2] = { {0, @@ -49,7 +47,6 @@ static const char * cmDocumentationUsage[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsageNote[][2] = { {0, @@ -67,7 +64,6 @@ static const char * cmDocumentationUsageNote[][2] = " --use-stderr = Ignored. Behavior is default in CMake >= 3.0.\n" \ " -- = Pass remaining options to the native tool.\n" -//---------------------------------------------------------------------------- static const char * cmDocumentationOptions[][2] = { CMAKE_STANDARD_OPTIONS_TABLE, @@ -377,7 +373,6 @@ int do_cmake(int ac, char const* const* av) } } -//---------------------------------------------------------------------------- static int do_build(int ac, char const* const* av) { #ifndef CMAKE_BUILD_WITH_CMAKE diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 79e1bf0..7c07131 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -1105,7 +1105,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) return 1; } -//---------------------------------------------------------------------------- int cmcmd::SymlinkLibrary(std::vector<std::string>& args) { int result = 0; @@ -1131,7 +1130,6 @@ int cmcmd::SymlinkLibrary(std::vector<std::string>& args) return result; } -//---------------------------------------------------------------------------- int cmcmd::SymlinkExecutable(std::vector<std::string>& args) { int result = 0; @@ -1148,7 +1146,6 @@ int cmcmd::SymlinkExecutable(std::vector<std::string>& args) return result; } -//---------------------------------------------------------------------------- bool cmcmd::SymlinkInternal(std::string const& file, std::string const& link) { if(cmSystemTools::FileExists(link.c_str()) || @@ -1164,7 +1161,6 @@ bool cmcmd::SymlinkInternal(std::string const& file, std::string const& link) #endif } -//---------------------------------------------------------------------------- static void cmcmdProgressReport(std::string const& dir, std::string const& num) { @@ -1223,7 +1219,6 @@ static void cmcmdProgressReport(std::string const& dir, } } -//---------------------------------------------------------------------------- int cmcmd::ExecuteEchoColor(std::vector<std::string>& args) { // The arguments are @@ -1323,7 +1318,6 @@ int cmcmd::ExecuteEchoColor(std::vector<std::string>& args) return 0; } -//---------------------------------------------------------------------------- int cmcmd::ExecuteLinkScript(std::vector<std::string>& args) { // The arguments are @@ -1427,7 +1421,6 @@ int cmcmd::ExecuteLinkScript(std::vector<std::string>& args) return result; } -//---------------------------------------------------------------------------- int cmcmd::WindowsCEEnvironment(const char* version, const std::string& name) { #if defined(CMAKE_HAVE_VS_GENERATORS) diff --git a/Source/ctest.cxx b/Source/ctest.cxx index 5c80487..23b9ec4 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -20,7 +20,6 @@ #include "CTest/cmCTestScriptHandler.h" #include "cmsys/Encoding.hxx" -//---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = { {0, @@ -28,7 +27,6 @@ static const char * cmDocumentationName[][2] = {0,0} }; -//---------------------------------------------------------------------------- static const char * cmDocumentationUsage[][2] = { {0, @@ -36,8 +34,6 @@ static const char * cmDocumentationUsage[][2] = {0,0} }; -//---------------------------------------------------------------------------- -//---------------------------------------------------------------------------- static const char * cmDocumentationOptions[][2] = { {"-C <cfg>, --build-config <cfg>", "Choose configuration to test."}, |