diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-02-01 15:40:25 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-02-01 16:02:53 (GMT) |
commit | 6d407ae439f1db086dd7a3675c8efce93a19fed3 (patch) | |
tree | 64ad3eaae4121fdba981a1f37931fa261b1c5966 /Source | |
parent | 2ddf3f4467bdd600027dd3532515d05d44996871 (diff) | |
download | CMake-6d407ae439f1db086dd7a3675c8efce93a19fed3.zip CMake-6d407ae439f1db086dd7a3675c8efce93a19fed3.tar.gz CMake-6d407ae439f1db086dd7a3675c8efce93a19fed3.tar.bz2 |
Use cmSourceFile::GetIsGenerated
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmExtraCodeBlocksGenerator.cxx | 2 | ||||
-rw-r--r-- | Source/cmExtraKateGenerator.cxx | 2 | ||||
-rw-r--r-- | Source/cmFileAPICodemodel.cxx | 2 | ||||
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 2 | ||||
-rw-r--r-- | Source/cmJsonObjects.cxx | 2 | ||||
-rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 2 | ||||
-rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 2 | ||||
-rw-r--r-- | Source/cmQTWrapUICommand.cxx | 2 | ||||
-rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 4 | ||||
-rw-r--r-- | Source/cmSourceFile.cxx | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 397508c..e408de3 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -362,7 +362,7 @@ void cmExtraCodeBlocksGenerator::CreateNewProjectFile( // don't add source files from UTILITY target which have the // GENERATED property set: if (gt->GetType() == cmStateEnums::UTILITY && - s->GetPropertyAsBool("GENERATED")) { + s->GetIsGenerated()) { continue; } diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index e28a865..23ba6b7 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -256,7 +256,7 @@ std::string cmExtraKateGenerator::GenerateFilesString( const std::vector<cmSourceFile*>& sources = makefile->GetSourceFiles(); for (cmSourceFile* sf : sources) { - if (sf->GetPropertyAsBool("GENERATED")) { + if (sf->GetIsGenerated()) { continue; } diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index 4597d4f..45e8303 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -882,7 +882,7 @@ Json::Value Target::DumpSource(cmGeneratorTarget::SourceAndKind const& sk, std::string const path = sk.Source.Value->GetFullPath(); source["path"] = RelativeIfUnder(this->TopSource, path); - if (sk.Source.Value->GetPropertyAsBool("GENERATED")) { + if (sk.Source.Value->GetIsGenerated()) { source["isGenerated"] = true; } this->AddBacktrace(source, sk.Source.Backtrace); diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index f1b32ee..b428ae1 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2460,7 +2460,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateUtilityTarget( this->AddXCodeProjBuildRule(gtgt, sources); for (auto sourceFile : sources) { - if (!sourceFile->GetPropertyAsBool("GENERATED")) { + if (!sourceFile->GetIsGenerated()) { this->CreateXCodeFileReference(sourceFile, gtgt); } } diff --git a/Source/cmJsonObjects.cxx b/Source/cmJsonObjects.cxx index 4b6b4d5..d723ced 100644 --- a/Source/cmJsonObjects.cxx +++ b/Source/cmJsonObjects.cxx @@ -323,7 +323,7 @@ static Json::Value DumpSourceFilesList( fileData.SetDefines(defines); } - fileData.IsGenerated = file->GetPropertyAsBool("GENERATED"); + fileData.IsGenerated = file->GetIsGenerated(); std::vector<std::string>& groupFileList = fileGroups[fileData]; groupFileList.push_back(file->GetFullPath()); } diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index c29c657..5d76dc2 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -1000,7 +1000,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement( // (either attached to this source file or another one), assume that one of // the target dependencies, OBJECT_DEPENDS or header file custom commands // will rebuild the file. - if (source->GetPropertyAsBool("GENERATED") && + if (source->GetIsGenerated() && !source->GetPropertyAsBool("__CMAKE_GENERATED_BY_CMAKE") && !source->GetCustomCommand() && !this->GetGlobalGenerator()->HasCustomCommandOutput(sourceFileName)) { diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index d2133ed..6acc7ef 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/Source/cmQTWrapCPPCommand.cxx @@ -50,7 +50,7 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& args, if (cmSystemTools::FileIsFullPath(*j)) { hname = *j; } else { - if (curr && curr->GetPropertyAsBool("GENERATED")) { + if (curr && curr->GetIsGenerated()) { hname = this->Makefile->GetCurrentBinaryDirectory(); } else { hname = this->Makefile->GetCurrentSourceDirectory(); diff --git a/Source/cmQTWrapUICommand.cxx b/Source/cmQTWrapUICommand.cxx index 25dcd1a..43b1fb9 100644 --- a/Source/cmQTWrapUICommand.cxx +++ b/Source/cmQTWrapUICommand.cxx @@ -58,7 +58,7 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args, if (cmSystemTools::FileIsFullPath(*j)) { uiName = *j; } else { - if (curr && curr->GetPropertyAsBool("GENERATED")) { + if (curr && curr->GetIsGenerated()) { uiName = this->Makefile->GetCurrentBinaryDirectory(); } else { uiName = this->Makefile->GetCurrentSourceDirectory(); diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index caeed15..41d29e8 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -686,7 +686,7 @@ bool cmQtAutoGenInitializer::InitScanFiles() if ((this->Moc.Enabled && !sf->GetPropertyAsBool("SKIP_AUTOMOC")) || (this->Uic.Enabled && !sf->GetPropertyAsBool("SKIP_AUTOUIC"))) { // Register source - const bool generated = sf->GetPropertyAsBool("GENERATED"); + const bool generated = sf->GetIsGenerated(); if (fileType == cmSystemTools::HEADER_FILE_FORMAT) { if (generated) { this->AutogenTarget.HeadersGenerated.push_back(absPath); @@ -712,7 +712,7 @@ bool cmQtAutoGenInitializer::InitScanFiles() qrc.QrcFile = cmSystemTools::GetRealPath(fPath); qrc.QrcName = cmSystemTools::GetFilenameWithoutLastExtension(qrc.QrcFile); - qrc.Generated = sf->GetPropertyAsBool("GENERATED"); + qrc.Generated = sf->GetIsGenerated(); // RCC options { std::string const opts = sf->GetSafeProperty("AUTORCC_OPTIONS"); diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx index cc72fb0..9d2bf90 100644 --- a/Source/cmSourceFile.cxx +++ b/Source/cmSourceFile.cxx @@ -119,7 +119,7 @@ bool cmSourceFile::FindFullPath(std::string* error) // If the file is generated compute the location without checking on // disk. - if (this->GetPropertyAsBool(propGENERATED)) { + if (this->GetIsGenerated()) { // The file is either already a full path or is relative to the // build directory for the target. this->Location.DirectoryUseBinary(); |