diff options
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 4648 |
1 files changed, 1907 insertions, 2741 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index dffe4cc..31fff9f 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -34,81 +34,111 @@ #define UNORDERED_SET std::set #endif -class cmGeneratorTarget::TargetPropertyEntry { +class cmGeneratorTarget::TargetPropertyEntry +{ static cmLinkImplItem NoLinkImplItem; + public: TargetPropertyEntry(cmsys::auto_ptr<cmCompiledGeneratorExpression> cge, cmLinkImplItem const& item = NoLinkImplItem) - : ge(cge), LinkImplItem(item) - {} + : ge(cge) + , LinkImplItem(item) + { + } const cmsys::auto_ptr<cmCompiledGeneratorExpression> ge; cmLinkImplItem const& LinkImplItem; }; cmLinkImplItem cmGeneratorTarget::TargetPropertyEntry::NoLinkImplItem; void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib, - cmGeneratorTarget const* target, cmake *cm) + cmGeneratorTarget const* target, cmake* cm) { - if(!badObjLib.empty()) - { + if (!badObjLib.empty()) { std::ostringstream e; e << "OBJECT library \"" << target->GetName() << "\" contains:\n"; - for(std::vector<cmSourceFile*>::const_iterator i = badObjLib.begin(); - i != badObjLib.end(); ++i) - { + for (std::vector<cmSourceFile*>::const_iterator i = badObjLib.begin(); + i != badObjLib.end(); ++i) { e << " " << (*i)->GetLocation().GetName() << "\n"; - } + } e << "but may contain only sources that compile, header files, and " "other files that would not affect linking of a normal library."; - cm->IssueMessage(cmake::FATAL_ERROR, e.str(), - target->GetBacktrace()); - } + cm->IssueMessage(cmake::FATAL_ERROR, e.str(), target->GetBacktrace()); + } } -struct ObjectSourcesTag {}; -struct CustomCommandsTag {}; -struct ExtraSourcesTag {}; -struct HeaderSourcesTag {}; -struct ExternalObjectsTag {}; -struct IDLSourcesTag {}; -struct ResxTag {}; -struct ModuleDefinitionFileTag {}; -struct AppManifestTag{}; -struct ManifestsTag{}; -struct CertificatesTag{}; -struct XamlTag{}; - -template<typename Tag, typename OtherTag> +struct ObjectSourcesTag +{ +}; +struct CustomCommandsTag +{ +}; +struct ExtraSourcesTag +{ +}; +struct HeaderSourcesTag +{ +}; +struct ExternalObjectsTag +{ +}; +struct IDLSourcesTag +{ +}; +struct ResxTag +{ +}; +struct ModuleDefinitionFileTag +{ +}; +struct AppManifestTag +{ +}; +struct ManifestsTag +{ +}; +struct CertificatesTag +{ +}; +struct XamlTag +{ +}; + +template <typename Tag, typename OtherTag> struct IsSameTag { - enum { + enum + { Result = false }; }; -template<typename Tag> +template <typename Tag> struct IsSameTag<Tag, Tag> { - enum { + enum + { Result = true }; }; -template<bool> +template <bool> struct DoAccept { - template <typename T> static void Do(T&, cmSourceFile*) {} + template <typename T> + static void Do(T&, cmSourceFile*) + { + } }; -template<> +template <> struct DoAccept<true> { static void Do(std::vector<cmSourceFile const*>& files, cmSourceFile* f) - { + { files.push_back(f); - } + } static void Do(cmGeneratorTarget::ResxData& data, cmSourceFile* f) - { + { // Build and save the name of the corresponding .h file // This relationship will be used later when building the project files. // Both names would have been auto generated from Visual Studio @@ -118,9 +148,9 @@ struct DoAccept<true> std::string hFileName = resx.substr(0, resx.find_last_of(".")) + ".h"; data.ExpectedResxHeaders.insert(hFileName); data.ResxSources.push_back(f); - } + } static void Do(cmGeneratorTarget::XamlData& data, cmSourceFile* f) - { + { // Build and save the name of the corresponding .h and .cpp file // This relationship will be used later when building the project files. // Both names would have been auto generated from Visual Studio @@ -132,28 +162,29 @@ struct DoAccept<true> data.ExpectedXamlHeaders.insert(hFileName); data.ExpectedXamlSources.insert(cppFileName); data.XamlSources.push_back(f); - } + } static void Do(std::string& data, cmSourceFile* f) - { + { data = f->GetFullPath(); - } + } }; -template<typename Tag, typename DataType = std::vector<cmSourceFile const*> > +template <typename Tag, typename DataType = std::vector<cmSourceFile const*> > struct TagVisitor { DataType& Data; std::vector<cmSourceFile*> BadObjLibFiles; cmGeneratorTarget const* Target; - cmGlobalGenerator *GlobalGenerator; + cmGlobalGenerator* GlobalGenerator; cmsys::RegularExpression Header; bool IsObjLib; TagVisitor(cmGeneratorTarget const* target, DataType& data) - : Data(data), Target(target), - GlobalGenerator(target->GetLocalGenerator()->GetGlobalGenerator()), - Header(CM_HEADER_REGEX), - IsObjLib(target->GetType() == cmState::OBJECT_LIBRARY) + : Data(data) + , Target(target) + , GlobalGenerator(target->GetLocalGenerator()->GetGlobalGenerator()) + , Header(CM_HEADER_REGEX) + , IsObjLib(target->GetType() == cmState::OBJECT_LIBRARY) { } @@ -163,113 +194,79 @@ struct TagVisitor this->GlobalGenerator->GetCMakeInstance()); } - void Accept(cmSourceFile *sf) + void Accept(cmSourceFile* sf) { std::string ext = cmSystemTools::LowerCase(sf->GetExtension()); - if(sf->GetCustomCommand()) - { + if (sf->GetCustomCommand()) { DoAccept<IsSameTag<Tag, CustomCommandsTag>::Result>::Do(this->Data, sf); - } - else if(this->Target->GetType() == cmState::UTILITY) - { + } else if (this->Target->GetType() == cmState::UTILITY) { DoAccept<IsSameTag<Tag, ExtraSourcesTag>::Result>::Do(this->Data, sf); - } - else if(sf->GetPropertyAsBool("HEADER_FILE_ONLY")) - { + } else if (sf->GetPropertyAsBool("HEADER_FILE_ONLY")) { DoAccept<IsSameTag<Tag, HeaderSourcesTag>::Result>::Do(this->Data, sf); - } - else if(sf->GetPropertyAsBool("EXTERNAL_OBJECT")) - { + } else if (sf->GetPropertyAsBool("EXTERNAL_OBJECT")) { DoAccept<IsSameTag<Tag, ExternalObjectsTag>::Result>::Do(this->Data, sf); - if(this->IsObjLib) - { + if (this->IsObjLib) { this->BadObjLibFiles.push_back(sf); - } } - else if(!sf->GetLanguage().empty()) - { + } else if (!sf->GetLanguage().empty()) { DoAccept<IsSameTag<Tag, ObjectSourcesTag>::Result>::Do(this->Data, sf); - } - else if(ext == "def") - { + } else if (ext == "def") { DoAccept<IsSameTag<Tag, ModuleDefinitionFileTag>::Result>::Do(this->Data, sf); - if(this->IsObjLib) - { + if (this->IsObjLib) { this->BadObjLibFiles.push_back(sf); - } } - else if(ext == "idl") - { + } else if (ext == "idl") { DoAccept<IsSameTag<Tag, IDLSourcesTag>::Result>::Do(this->Data, sf); - if(this->IsObjLib) - { + if (this->IsObjLib) { this->BadObjLibFiles.push_back(sf); - } } - else if(ext == "resx") - { + } else if (ext == "resx") { DoAccept<IsSameTag<Tag, ResxTag>::Result>::Do(this->Data, sf); - } - else if (ext == "appxmanifest") - { + } else if (ext == "appxmanifest") { DoAccept<IsSameTag<Tag, AppManifestTag>::Result>::Do(this->Data, sf); - } - else if (ext == "manifest") - { + } else if (ext == "manifest") { DoAccept<IsSameTag<Tag, ManifestsTag>::Result>::Do(this->Data, sf); - } - else if (ext == "pfx") - { + } else if (ext == "pfx") { DoAccept<IsSameTag<Tag, CertificatesTag>::Result>::Do(this->Data, sf); - } - else if (ext == "xaml") - { + } else if (ext == "xaml") { DoAccept<IsSameTag<Tag, XamlTag>::Result>::Do(this->Data, sf); - } - else if(this->Header.find(sf->GetFullPath().c_str())) - { + } else if (this->Header.find(sf->GetFullPath().c_str())) { DoAccept<IsSameTag<Tag, HeaderSourcesTag>::Result>::Do(this->Data, sf); - } - else if(this->GlobalGenerator->IgnoreFile(sf->GetExtension().c_str())) - { + } else if (this->GlobalGenerator->IgnoreFile(sf->GetExtension().c_str())) { DoAccept<IsSameTag<Tag, ExtraSourcesTag>::Result>::Do(this->Data, sf); - } - else - { + } else { DoAccept<IsSameTag<Tag, ExtraSourcesTag>::Result>::Do(this->Data, sf); - } + } } }; void CreatePropertyGeneratorExpressions( - cmStringRange const& entries, - cmBacktraceRange const& backtraces, - std::vector<cmGeneratorTarget::TargetPropertyEntry*>& items, - bool evaluateForBuildsystem = false) + cmStringRange const& entries, cmBacktraceRange const& backtraces, + std::vector<cmGeneratorTarget::TargetPropertyEntry*>& items, + bool evaluateForBuildsystem = false) { std::vector<cmListFileBacktrace>::const_iterator btIt = backtraces.begin(); for (std::vector<std::string>::const_iterator it = entries.begin(); - it != entries.end(); ++it, ++btIt) - { + it != entries.end(); ++it, ++btIt) { cmGeneratorExpression ge(*btIt); cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(*it); cge->SetEvaluateForBuildsystem(evaluateForBuildsystem); items.push_back(new cmGeneratorTarget::TargetPropertyEntry(cge)); - } + } } cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg) - : Target(t), - SourceFileFlagsConstructed(false), - PolicyWarnedCMP0022(false), - DebugIncludesDone(false), - DebugCompileOptionsDone(false), - DebugCompileFeaturesDone(false), - DebugCompileDefinitionsDone(false), - DebugSourcesDone(false), - LinkImplementationLanguageIsContextDependent(true), - UtilityItemsDone(false) + : Target(t) + , SourceFileFlagsConstructed(false) + , PolicyWarnedCMP0022(false) + , DebugIncludesDone(false) + , DebugCompileOptionsDone(false) + , DebugCompileFeaturesDone(false) + , DebugCompileDefinitionsDone(false) + , DebugSourcesDone(false) + , LinkImplementationLanguageIsContextDependent(true) + , UtilityItemsDone(false) { this->Makefile = this->Target->GetMakefile(); this->LocalGenerator = lg; @@ -277,34 +274,29 @@ cmGeneratorTarget::cmGeneratorTarget(cmTarget* t, cmLocalGenerator* lg) this->GlobalGenerator->ComputeTargetObjectDirectory(this); - CreatePropertyGeneratorExpressions( - t->GetIncludeDirectoriesEntries(), - t->GetIncludeDirectoriesBacktraces(), - this->IncludeDirectoriesEntries); + CreatePropertyGeneratorExpressions(t->GetIncludeDirectoriesEntries(), + t->GetIncludeDirectoriesBacktraces(), + this->IncludeDirectoriesEntries); - CreatePropertyGeneratorExpressions( - t->GetCompileOptionsEntries(), - t->GetCompileOptionsBacktraces(), - this->CompileOptionsEntries); + CreatePropertyGeneratorExpressions(t->GetCompileOptionsEntries(), + t->GetCompileOptionsBacktraces(), + this->CompileOptionsEntries); - CreatePropertyGeneratorExpressions( - t->GetCompileFeaturesEntries(), - t->GetCompileFeaturesBacktraces(), - this->CompileFeaturesEntries); + CreatePropertyGeneratorExpressions(t->GetCompileFeaturesEntries(), + t->GetCompileFeaturesBacktraces(), + this->CompileFeaturesEntries); - CreatePropertyGeneratorExpressions( - t->GetCompileDefinitionsEntries(), - t->GetCompileDefinitionsBacktraces(), - this->CompileDefinitionsEntries); + CreatePropertyGeneratorExpressions(t->GetCompileDefinitionsEntries(), + t->GetCompileDefinitionsBacktraces(), + this->CompileDefinitionsEntries); - CreatePropertyGeneratorExpressions( - t->GetSourceEntries(), - t->GetSourceBacktraces(), - this->SourceEntries, true); + CreatePropertyGeneratorExpressions(t->GetSourceEntries(), + t->GetSourceBacktraces(), + this->SourceEntries, true); - this->DLLPlatform = (this->Makefile->IsOn("WIN32") || - this->Makefile->IsOn("CYGWIN") || - this->Makefile->IsOn("MINGW")); + this->DLLPlatform = + (this->Makefile->IsOn("WIN32") || this->Makefile->IsOn("CYGWIN") || + this->Makefile->IsOn("MINGW")); this->PolicyMap = t->PolicyMap; } @@ -337,80 +329,65 @@ const std::string& cmGeneratorTarget::GetName() const std::string cmGeneratorTarget::GetExportName() const { - const char *exportName = this->GetProperty("EXPORT_NAME"); + const char* exportName = this->GetProperty("EXPORT_NAME"); - if (exportName && *exportName) - { - if (!cmGeneratorExpression::IsValidTargetName(exportName)) - { + if (exportName && *exportName) { + if (!cmGeneratorExpression::IsValidTargetName(exportName)) { std::ostringstream e; e << "EXPORT_NAME property \"" << exportName << "\" for \"" << this->GetName() << "\": is not valid."; cmSystemTools::Error(e.str().c_str()); return ""; - } - return exportName; } + return exportName; + } return this->GetName(); } -const char *cmGeneratorTarget::GetProperty(const std::string& prop) const +const char* cmGeneratorTarget::GetProperty(const std::string& prop) const { return this->Target->GetProperty(prop); } const char* cmGeneratorTarget::GetOutputTargetType(bool implib) const { - switch(this->GetType()) - { + switch (this->GetType()) { case cmState::SHARED_LIBRARY: - if(this->IsDLLPlatform()) - { - if(implib) - { + if (this->IsDLLPlatform()) { + if (implib) { // A DLL import library is treated as an archive target. return "ARCHIVE"; - } - else - { + } else { // A DLL shared library is treated as a runtime target. return "RUNTIME"; - } } - else - { + } else { // For non-DLL platforms shared libraries are treated as // library targets. return "LIBRARY"; - } + } case cmState::STATIC_LIBRARY: // Static libraries are always treated as archive targets. return "ARCHIVE"; case cmState::MODULE_LIBRARY: - if(implib) - { + if (implib) { // Module libraries are always treated as library targets. return "ARCHIVE"; - } - else - { + } else { // Module import libraries are treated as archive targets. return "LIBRARY"; - } + } case cmState::EXECUTABLE: - if(implib) - { + if (implib) { // Executable import libraries are treated as archive targets. return "ARCHIVE"; - } - else - { + } else { // Executables are always treated as runtime targets. return "RUNTIME"; - } + } default: break; - } + } return ""; } @@ -421,8 +398,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config, OutputNameKey key(config, implib); cmGeneratorTarget::OutputNameMapType::iterator i = this->OutputNameMap.find(key); - if(i == this->OutputNameMap.end()) - { + if (i == this->OutputNameMap.end()) { // Add empty name in map to detect potential recursion. OutputNameMapType::value_type entry(key, ""); i = this->OutputNameMap.insert(entry).first; @@ -431,57 +407,48 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config, std::vector<std::string> props; std::string type = this->GetOutputTargetType(implib); std::string configUpper = cmSystemTools::UpperCase(config); - if(!type.empty() && !configUpper.empty()) - { + if (!type.empty() && !configUpper.empty()) { // <ARCHIVE|LIBRARY|RUNTIME>_OUTPUT_NAME_<CONFIG> props.push_back(type + "_OUTPUT_NAME_" + configUpper); - } - if(!type.empty()) - { + } + if (!type.empty()) { // <ARCHIVE|LIBRARY|RUNTIME>_OUTPUT_NAME props.push_back(type + "_OUTPUT_NAME"); - } - if(!configUpper.empty()) - { + } + if (!configUpper.empty()) { // OUTPUT_NAME_<CONFIG> props.push_back("OUTPUT_NAME_" + configUpper); // <CONFIG>_OUTPUT_NAME props.push_back(configUpper + "_OUTPUT_NAME"); - } + } // OUTPUT_NAME props.push_back("OUTPUT_NAME"); std::string outName; - for(std::vector<std::string>::const_iterator it = props.begin(); - it != props.end(); ++it) - { - if (const char* outNameProp = this->GetProperty(*it)) - { + for (std::vector<std::string>::const_iterator it = props.begin(); + it != props.end(); ++it) { + if (const char* outNameProp = this->GetProperty(*it)) { outName = outNameProp; break; - } } + } - if(outName.empty()) - { + if (outName.empty()) { outName = this->GetName(); - } + } // Now evaluate genex and update the previously-prepared map entry. cmGeneratorExpression ge; cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(outName); i->second = cge->Evaluate(this->LocalGenerator, config); - } - else if(i->second.empty()) - { + } else if (i->second.empty()) { // An empty map entry indicates we have been called recursively // from the above block. - this->LocalGenerator->GetCMakeInstance() - ->IssueMessage( + this->LocalGenerator->GetCMakeInstance()->IssueMessage( cmake::FATAL_ERROR, "Target '" + this->GetName() + "' OUTPUT_NAME depends on itself.", this->GetBacktrace()); - } + } return i->second; } @@ -492,8 +459,7 @@ void cmGeneratorTarget::AddSource(const std::string& src) cmGeneratorExpression ge(lfbt); cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(src); cge->SetEvaluateForBuildsystem(true); - this->SourceEntries.push_back( - new TargetPropertyEntry(cge)); + this->SourceEntries.push_back(new TargetPropertyEntry(cge)); this->SourceFilesMap.clear(); this->LinkImplementationLanguageIsContextDependent = true; } @@ -501,8 +467,7 @@ void cmGeneratorTarget::AddSource(const std::string& src) void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs) { this->Target->AddTracedSources(srcs); - if (!srcs.empty()) - { + if (!srcs.empty()) { std::string srcFiles = cmJoin(srcs, ";"); this->SourceFilesMap.clear(); this->LinkImplementationLanguageIsContextDependent = true; @@ -511,52 +476,46 @@ void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs) cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles); cge->SetEvaluateForBuildsystem(true); this->SourceEntries.push_back( - new cmGeneratorTarget::TargetPropertyEntry(cge)); - } + new cmGeneratorTarget::TargetPropertyEntry(cge)); + } } -std::vector<cmSourceFile*> const* -cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const +std::vector<cmSourceFile*> const* cmGeneratorTarget::GetSourceDepends( + cmSourceFile const* sf) const { SourceEntriesType::const_iterator i = this->SourceDepends.find(sf); - if(i != this->SourceDepends.end()) - { + if (i != this->SourceDepends.end()) { return &i->second.Depends; - } + } return 0; } -static void handleSystemIncludesDep(cmLocalGenerator *lg, - cmGeneratorTarget const* depTgt, - const std::string& config, - cmGeneratorTarget const* headTarget, - cmGeneratorExpressionDAGChecker *dagChecker, - std::vector<std::string>& result, - bool excludeImported) +static void handleSystemIncludesDep( + cmLocalGenerator* lg, cmGeneratorTarget const* depTgt, + const std::string& config, cmGeneratorTarget const* headTarget, + cmGeneratorExpressionDAGChecker* dagChecker, + std::vector<std::string>& result, bool excludeImported) { if (const char* dirs = - depTgt->GetProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES")) - { + depTgt->GetProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES")) { cmGeneratorExpression ge; - cmSystemTools::ExpandListArgument(ge.Parse(dirs) - ->Evaluate(lg, - config, false, headTarget, - depTgt, dagChecker), result); - } - if (!depTgt->IsImported() || excludeImported) - { + cmSystemTools::ExpandListArgument( + ge.Parse(dirs)->Evaluate(lg, config, false, headTarget, depTgt, + dagChecker), + result); + } + if (!depTgt->IsImported() || excludeImported) { return; - } + } if (const char* dirs = - depTgt->GetProperty("INTERFACE_INCLUDE_DIRECTORIES")) - { + depTgt->GetProperty("INTERFACE_INCLUDE_DIRECTORIES")) { cmGeneratorExpression ge; - cmSystemTools::ExpandListArgument(ge.Parse(dirs) - ->Evaluate(lg, - config, false, headTarget, - depTgt, dagChecker), result); - } + cmSystemTools::ExpandListArgument( + ge.Parse(dirs)->Evaluate(lg, config, false, headTarget, depTgt, + dagChecker), + result); + } } /* clang-format off */ @@ -572,71 +531,60 @@ static void handleSystemIncludesDep(cmLocalGenerator *lg, } /* clang-format on */ -#define IMPLEMENT_VISIT(DATA) \ - IMPLEMENT_VISIT_IMPL(DATA, EMPTY) \ +#define IMPLEMENT_VISIT(DATA) IMPLEMENT_VISIT_IMPL(DATA, EMPTY) #define EMPTY #define COMMA , -void -cmGeneratorTarget -::GetObjectSources(std::vector<cmSourceFile const*> &data, - const std::string& config) const +void cmGeneratorTarget::GetObjectSources( + std::vector<cmSourceFile const*>& data, const std::string& config) const { IMPLEMENT_VISIT(ObjectSources); - if (!this->Objects.empty()) - { + if (!this->Objects.empty()) { return; - } + } - for(std::vector<cmSourceFile const*>::const_iterator it = data.begin(); - it != data.end(); ++it) - { + for (std::vector<cmSourceFile const*>::const_iterator it = data.begin(); + it != data.end(); ++it) { this->Objects[*it]; - } + } this->LocalGenerator->ComputeObjectFilenames(this->Objects, this); } void cmGeneratorTarget::ComputeObjectMapping() { - if(!this->Objects.empty()) - { + if (!this->Objects.empty()) { return; - } + } std::vector<std::string> configs; this->Makefile->GetConfigurations(configs); - if (configs.empty()) - { + if (configs.empty()) { configs.push_back(""); - } - for(std::vector<std::string>::const_iterator ci = configs.begin(); - ci != configs.end(); ++ci) - { + } + for (std::vector<std::string>::const_iterator ci = configs.begin(); + ci != configs.end(); ++ci) { std::vector<cmSourceFile const*> sourceFiles; this->GetObjectSources(sourceFiles, *ci); - } + } } const char* cmGeneratorTarget::GetFeature(const std::string& feature, const std::string& config) const { - if(!config.empty()) - { + if (!config.empty()) { std::string featureConfig = feature; featureConfig += "_"; featureConfig += cmSystemTools::UpperCase(config); - if(const char* value = this->GetProperty(featureConfig)) - { + if (const char* value = this->GetProperty(featureConfig)) { return value; - } } - if(const char* value = this->GetProperty(feature)) - { + } + if (const char* value = this->GetProperty(feature)) { return value; - } + } return this->LocalGenerator->GetFeature(feature, config); } @@ -660,129 +608,108 @@ void cmGeneratorTarget::AddExplicitObjectName(cmSourceFile const* sf) bool cmGeneratorTarget::HasExplicitObjectName(cmSourceFile const* file) const { const_cast<cmGeneratorTarget*>(this)->ComputeObjectMapping(); - std::set<cmSourceFile const*>::const_iterator it - = this->ExplicitObjectName.find(file); + std::set<cmSourceFile const*>::const_iterator it = + this->ExplicitObjectName.find(file); return it != this->ExplicitObjectName.end(); } -void cmGeneratorTarget -::GetIDLSources(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetIDLSources(std::vector<cmSourceFile const*>& data, + const std::string& config) const { IMPLEMENT_VISIT(IDLSources); } -void -cmGeneratorTarget -::GetHeaderSources(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetHeaderSources( + std::vector<cmSourceFile const*>& data, const std::string& config) const { IMPLEMENT_VISIT(HeaderSources); } -void cmGeneratorTarget -::GetExtraSources(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetExtraSources(std::vector<cmSourceFile const*>& data, + const std::string& config) const { IMPLEMENT_VISIT(ExtraSources); } -void -cmGeneratorTarget -::GetCustomCommands(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetCustomCommands( + std::vector<cmSourceFile const*>& data, const std::string& config) const { IMPLEMENT_VISIT(CustomCommands); } -void -cmGeneratorTarget -::GetExternalObjects(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetExternalObjects( + std::vector<cmSourceFile const*>& data, const std::string& config) const { IMPLEMENT_VISIT(ExternalObjects); } -void -cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& srcs, - const std::string& config) const +void cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& srcs, + const std::string& config) const { ResxData data; IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData) srcs = data.ExpectedResxHeaders; } -void cmGeneratorTarget -::GetResxSources(std::vector<cmSourceFile const*>& srcs, - const std::string& config) const +void cmGeneratorTarget::GetResxSources(std::vector<cmSourceFile const*>& srcs, + const std::string& config) const { ResxData data; IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData) srcs = data.ResxSources; } -void -cmGeneratorTarget -::GetAppManifest(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetAppManifest(std::vector<cmSourceFile const*>& data, + const std::string& config) const { IMPLEMENT_VISIT(AppManifest); } -void -cmGeneratorTarget -::GetManifests(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetManifests(std::vector<cmSourceFile const*>& data, + const std::string& config) const { IMPLEMENT_VISIT(Manifests); } -void -cmGeneratorTarget -::GetCertificates(std::vector<cmSourceFile const*>& data, - const std::string& config) const +void cmGeneratorTarget::GetCertificates(std::vector<cmSourceFile const*>& data, + const std::string& config) const { IMPLEMENT_VISIT(Certificates); } -void -cmGeneratorTarget::GetExpectedXamlHeaders(std::set<std::string>& headers, - const std::string& config) const +void cmGeneratorTarget::GetExpectedXamlHeaders(std::set<std::string>& headers, + const std::string& config) const { XamlData data; IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData) headers = data.ExpectedXamlHeaders; } -void -cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs, - const std::string& config) const +void cmGeneratorTarget::GetExpectedXamlSources(std::set<std::string>& srcs, + const std::string& config) const { XamlData data; IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData) - srcs = data.ExpectedXamlSources; + srcs = data.ExpectedXamlSources; } std::set<cmLinkItem> const& cmGeneratorTarget::GetUtilityItems() const { - if(!this->UtilityItemsDone) - { + if (!this->UtilityItemsDone) { this->UtilityItemsDone = true; std::set<std::string> const& utilities = this->GetUtilities(); - for(std::set<std::string>::const_iterator i = utilities.begin(); - i != utilities.end(); ++i) - { + for (std::set<std::string>::const_iterator i = utilities.begin(); + i != utilities.end(); ++i) { cmGeneratorTarget* gt = - this->LocalGenerator->FindGeneratorTargetToUse(*i); + this->LocalGenerator->FindGeneratorTargetToUse(*i); this->UtilityItems.insert(cmLinkItem(*i, gt)); - } } + } return this->UtilityItems; } -void cmGeneratorTarget -::GetXamlSources(std::vector<cmSourceFile const*>& srcs, - const std::string& config) const +void cmGeneratorTarget::GetXamlSources(std::vector<cmSourceFile const*>& srcs, + const std::string& config) const { XamlData data; IMPLEMENT_VISIT_IMPL(Xaml, COMMA cmGeneratorTarget::XamlData) @@ -792,31 +719,28 @@ void cmGeneratorTarget const char* cmGeneratorTarget::GetLocation(const std::string& config) const { static std::string location; - if (this->IsImported()) - { + if (this->IsImported()) { location = this->Target->ImportedGetFullPath(config, false); - } - else - { + } else { location = this->GetFullPath(config, false); - } + } return location.c_str(); } -std::vector<cmCustomCommand> const& -cmGeneratorTarget::GetPreBuildCommands() const +std::vector<cmCustomCommand> const& cmGeneratorTarget::GetPreBuildCommands() + const { return this->Target->GetPreBuildCommands(); } -std::vector<cmCustomCommand> const& -cmGeneratorTarget::GetPreLinkCommands() const +std::vector<cmCustomCommand> const& cmGeneratorTarget::GetPreLinkCommands() + const { return this->Target->GetPreLinkCommands(); } -std::vector<cmCustomCommand> const& -cmGeneratorTarget::GetPostBuildCommands() const +std::vector<cmCustomCommand> const& cmGeneratorTarget::GetPostBuildCommands() + const { return this->Target->GetPostBuildCommands(); } @@ -834,94 +758,83 @@ bool cmGeneratorTarget::IsImportedGloballyVisible() const const char* cmGeneratorTarget::GetLocationForBuild() const { static std::string location; - if(this->IsImported()) - { + if (this->IsImported()) { location = this->Target->ImportedGetFullPath("", false); return location.c_str(); - } + } // Now handle the deprecated build-time configuration location. location = this->GetDirectory(); const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR"); - if(cfgid && strcmp(cfgid, ".") != 0) - { + if (cfgid && strcmp(cfgid, ".") != 0) { location += "/"; location += cfgid; - } + } - if(this->IsAppBundleOnApple()) - { - std::string macdir = this->BuildMacContentDirectory("", "", - false); - if(!macdir.empty()) - { + if (this->IsAppBundleOnApple()) { + std::string macdir = this->BuildMacContentDirectory("", "", false); + if (!macdir.empty()) { location += "/"; location += macdir; - } } + } location += "/"; location += this->GetFullName("", false); return location.c_str(); } - -bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir, - const std::string& config) const +bool cmGeneratorTarget::IsSystemIncludeDirectory( + const std::string& dir, const std::string& config) const { assert(this->GetType() != cmState::INTERFACE_LIBRARY); std::string config_upper; - if(!config.empty()) - { + if (!config.empty()) { config_upper = cmSystemTools::UpperCase(config); - } + } typedef std::map<std::string, std::vector<std::string> > IncludeCacheType; IncludeCacheType::const_iterator iter = - this->SystemIncludesCache.find(config_upper); + this->SystemIncludesCache.find(config_upper); - if (iter == this->SystemIncludesCache.end()) - { + if (iter == this->SystemIncludesCache.end()) { cmGeneratorExpressionDAGChecker dagChecker( - this->GetName(), - "SYSTEM_INCLUDE_DIRECTORIES", 0, 0); + this->GetName(), "SYSTEM_INCLUDE_DIRECTORIES", 0, 0); - bool excludeImported - = this->GetPropertyAsBool("NO_SYSTEM_FROM_IMPORTED"); + bool excludeImported = this->GetPropertyAsBool("NO_SYSTEM_FROM_IMPORTED"); std::vector<std::string> result; - for (std::set<std::string>::const_iterator - it = this->Target->GetSystemIncludeDirectories().begin(); - it != this->Target->GetSystemIncludeDirectories().end(); ++it) - { + for (std::set<std::string>::const_iterator it = + this->Target->GetSystemIncludeDirectories().begin(); + it != this->Target->GetSystemIncludeDirectories().end(); ++it) { cmGeneratorExpression ge; - cmSystemTools::ExpandListArgument(ge.Parse(*it) - ->Evaluate(this->LocalGenerator, - config, false, this, - &dagChecker), result); - } + cmSystemTools::ExpandListArgument( + ge.Parse(*it)->Evaluate(this->LocalGenerator, config, false, this, + &dagChecker), + result); + } std::vector<cmGeneratorTarget const*> const& deps = this->GetLinkImplementationClosure(config); - for(std::vector<cmGeneratorTarget const*>::const_iterator - li = deps.begin(), le = deps.end(); li != le; ++li) - { + for (std::vector<cmGeneratorTarget const *>::const_iterator + li = deps.begin(), + le = deps.end(); + li != le; ++li) { handleSystemIncludesDep(this->LocalGenerator, *li, config, this, &dagChecker, result, excludeImported); - } + } std::set<std::string> unique; - for(std::vector<std::string>::iterator li = result.begin(); - li != result.end(); ++li) - { + for (std::vector<std::string>::iterator li = result.begin(); + li != result.end(); ++li) { cmSystemTools::ConvertToUnixSlashes(*li); unique.insert(*li); - } + } result.clear(); result.insert(result.end(), unique.begin(), unique.end()); IncludeCacheType::value_type entry(config_upper, result); iter = this->SystemIncludesCache.insert(entry).first; - } + } return std::binary_search(iter->second.begin(), iter->second.end(), dir); } @@ -936,128 +849,111 @@ static void AddInterfaceEntries( std::string const& prop, std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries) { - if(cmLinkImplementationLibraries const* impl = - thisTarget->GetLinkImplementationLibraries(config)) - { + if (cmLinkImplementationLibraries const* impl = + thisTarget->GetLinkImplementationLibraries(config)) { for (std::vector<cmLinkImplItem>::const_iterator - it = impl->Libraries.begin(), end = impl->Libraries.end(); - it != end; ++it) - { - if(it->Target) - { - std::string genex = - "$<TARGET_PROPERTY:" + *it + "," + prop + ">"; + it = impl->Libraries.begin(), + end = impl->Libraries.end(); + it != end; ++it) { + if (it->Target) { + std::string genex = "$<TARGET_PROPERTY:" + *it + "," + prop + ">"; cmGeneratorExpression ge(it->Backtrace); cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(genex); cge->SetEvaluateForBuildsystem(true); entries.push_back( new cmGeneratorTarget::TargetPropertyEntry(cge, *it)); - } } } + } } -static bool processSources(cmGeneratorTarget const* tgt, - const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, - std::vector<std::string> &srcs, - UNORDERED_SET<std::string> &uniqueSrcs, - cmGeneratorExpressionDAGChecker *dagChecker, - std::string const& config, bool debugSources) +static bool processSources( + cmGeneratorTarget const* tgt, + const std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries, + std::vector<std::string>& srcs, UNORDERED_SET<std::string>& uniqueSrcs, + cmGeneratorExpressionDAGChecker* dagChecker, std::string const& config, + bool debugSources) { - cmMakefile *mf = tgt->Target->GetMakefile(); + cmMakefile* mf = tgt->Target->GetMakefile(); bool contextDependent = false; - for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator - it = entries.begin(), end = entries.end(); it != end; ++it) - { + for (std::vector<cmGeneratorTarget::TargetPropertyEntry *>::const_iterator + it = entries.begin(), + end = entries.end(); + it != end; ++it) { cmLinkImplItem const& item = (*it)->LinkImplItem; std::string const& targetName = item; std::vector<std::string> entrySources; - cmSystemTools::ExpandListArgument((*it)->ge->Evaluate( - tgt->GetLocalGenerator(), - config, - false, - tgt, - tgt, - dagChecker), - entrySources); - - if ((*it)->ge->GetHadContextSensitiveCondition()) - { + cmSystemTools::ExpandListArgument( + (*it)->ge->Evaluate(tgt->GetLocalGenerator(), config, false, tgt, tgt, + dagChecker), + entrySources); + + if ((*it)->ge->GetHadContextSensitiveCondition()) { contextDependent = true; - } + } - for(std::vector<std::string>::iterator i = entrySources.begin(); - i != entrySources.end(); ++i) - { + for (std::vector<std::string>::iterator i = entrySources.begin(); + i != entrySources.end(); ++i) { std::string& src = *i; cmSourceFile* sf = mf->GetOrCreateSource(src); std::string e; std::string fullPath = sf->GetFullPath(&e); - if(fullPath.empty()) - { - if(!e.empty()) - { + if (fullPath.empty()) { + if (!e.empty()) { cmake* cm = tgt->GetLocalGenerator()->GetCMakeInstance(); - cm->IssueMessage(cmake::FATAL_ERROR, e, - tgt->GetBacktrace()); - } - return contextDependent; + cm->IssueMessage(cmake::FATAL_ERROR, e, tgt->GetBacktrace()); } + return contextDependent; + } - if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str())) - { + if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str())) { std::ostringstream err; - if (!targetName.empty()) - { - err << "Target \"" << targetName << "\" contains relative " - "path in its INTERFACE_SOURCES:\n" - " \"" << src << "\""; - } - else - { + if (!targetName.empty()) { + err << "Target \"" << targetName + << "\" contains relative " + "path in its INTERFACE_SOURCES:\n" + " \"" + << src << "\""; + } else { err << "Found relative path while evaluating sources of " - "\"" << tgt->GetName() << "\":\n \"" << src << "\"\n"; - } + "\"" + << tgt->GetName() << "\":\n \"" << src << "\"\n"; + } tgt->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, err.str()); return contextDependent; - } - src = fullPath; } + src = fullPath; + } std::string usedSources; - for(std::vector<std::string>::iterator - li = entrySources.begin(); li != entrySources.end(); ++li) - { + for (std::vector<std::string>::iterator li = entrySources.begin(); + li != entrySources.end(); ++li) { std::string src = *li; - if(uniqueSrcs.insert(src).second) - { + if (uniqueSrcs.insert(src).second) { srcs.push_back(src); - if (debugSources) - { + if (debugSources) { usedSources += " * " + src + "\n"; - } } } - if (!usedSources.empty()) - { - tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(cmake::LOG, - std::string("Used sources for target ") - + tgt->GetName() + ":\n" - + usedSources, (*it)->ge->GetBacktrace()); - } } + if (!usedSources.empty()) { + tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage( + cmake::LOG, std::string("Used sources for target ") + tgt->GetName() + + ":\n" + usedSources, + (*it)->ge->GetBacktrace()); + } + } return contextDependent; } -void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files, - const std::string& config) const +void cmGeneratorTarget::GetSourceFiles(std::vector<std::string>& files, + const std::string& config) const { assert(this->GetType() != cmState::INTERFACE_LIBRARY); - if (!this->LocalGenerator->GetGlobalGenerator()->GetConfigureDoneCMP0026()) - { + if (!this->LocalGenerator->GetGlobalGenerator()->GetConfigureDoneCMP0026()) { // At configure-time, this method can be called as part of getting the // LOCATION property or to export() a file to be include()d. However // there is no cmGeneratorTarget at configure-time, so search the SOURCES @@ -1065,125 +961,99 @@ void cmGeneratorTarget::GetSourceFiles(std::vector<std::string> &files, // behavior of CMP0024 and CMP0026 only. cmStringRange sourceEntries = this->Target->GetSourceEntries(); - for(cmStringRange::const_iterator - i = sourceEntries.begin(); - i != sourceEntries.end(); ++i) - { + for (cmStringRange::const_iterator i = sourceEntries.begin(); + i != sourceEntries.end(); ++i) { std::string const& entry = *i; std::vector<std::string> items; cmSystemTools::ExpandListArgument(entry, items); - for (std::vector<std::string>::const_iterator - li = items.begin(); li != items.end(); ++li) - { - if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") && - (*li)[li->size() - 1] == '>') - { + for (std::vector<std::string>::const_iterator li = items.begin(); + li != items.end(); ++li) { + if (cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") && + (*li)[li->size() - 1] == '>') { continue; - } - files.push_back(*li); } + files.push_back(*li); } - return; } + return; + } std::vector<std::string> debugProperties; - const char *debugProp = - this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); - if (debugProp) - { + const char* debugProp = + this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); + if (debugProp) { cmSystemTools::ExpandListArgument(debugProp, debugProperties); - } + } - bool debugSources = !this->DebugSourcesDone - && std::find(debugProperties.begin(), - debugProperties.end(), - "SOURCES") - != debugProperties.end(); + bool debugSources = !this->DebugSourcesDone && + std::find(debugProperties.begin(), debugProperties.end(), "SOURCES") != + debugProperties.end(); - if (this->LocalGenerator->GetGlobalGenerator()->GetConfigureDoneCMP0026()) - { + if (this->LocalGenerator->GetGlobalGenerator()->GetConfigureDoneCMP0026()) { this->DebugSourcesDone = true; - } + } - cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), - "SOURCES", 0, 0); + cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), "SOURCES", 0, 0); UNORDERED_SET<std::string> uniqueSrcs; - bool contextDependentDirectSources = processSources(this, - this->SourceEntries, - files, - uniqueSrcs, - &dagChecker, - config, - debugSources); + bool contextDependentDirectSources = + processSources(this, this->SourceEntries, files, uniqueSrcs, &dagChecker, + config, debugSources); std::vector<cmGeneratorTarget::TargetPropertyEntry*> linkInterfaceSourcesEntries; - AddInterfaceEntries( - this, config, "INTERFACE_SOURCES", - linkInterfaceSourcesEntries); + AddInterfaceEntries(this, config, "INTERFACE_SOURCES", + linkInterfaceSourcesEntries); std::vector<std::string>::size_type numFilesBefore = files.size(); - bool contextDependentInterfaceSources = processSources(this, - linkInterfaceSourcesEntries, - files, - uniqueSrcs, - &dagChecker, - config, - debugSources); - - if (!contextDependentDirectSources - && !(contextDependentInterfaceSources && numFilesBefore < files.size())) - { + bool contextDependentInterfaceSources = + processSources(this, linkInterfaceSourcesEntries, files, uniqueSrcs, + &dagChecker, config, debugSources); + + if (!contextDependentDirectSources && + !(contextDependentInterfaceSources && numFilesBefore < files.size())) { this->LinkImplementationLanguageIsContextDependent = false; - } + } cmDeleteAll(linkInterfaceSourcesEntries); } -void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files, +void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*>& files, const std::string& config) const { // Lookup any existing link implementation for this configuration. std::string key = cmSystemTools::UpperCase(config); - if(!this->LinkImplementationLanguageIsContextDependent) - { + if (!this->LinkImplementationLanguageIsContextDependent) { files = this->SourceFilesMap.begin()->second; return; - } + } - SourceFilesMapType::iterator - it = this->SourceFilesMap.find(key); - if(it != this->SourceFilesMap.end()) - { + SourceFilesMapType::iterator it = this->SourceFilesMap.find(key); + if (it != this->SourceFilesMap.end()) { files = it->second; - } - else - { + } else { std::vector<std::string> srcs; this->GetSourceFiles(srcs, config); std::set<cmSourceFile*> emitted; - for(std::vector<std::string>::const_iterator i = srcs.begin(); - i != srcs.end(); ++i) - { + for (std::vector<std::string>::const_iterator i = srcs.begin(); + i != srcs.end(); ++i) { cmSourceFile* sf = this->Makefile->GetOrCreateSource(*i); - if (emitted.insert(sf).second) - { + if (emitted.insert(sf).second) { files.push_back(sf); - } } - this->SourceFilesMap[key] = files; } + this->SourceFilesMap[key] = files; + } } -std::string -cmGeneratorTarget::GetCompilePDBName(const std::string& config) const +std::string cmGeneratorTarget::GetCompilePDBName( + const std::string& config) const { std::string prefix; std::string base; @@ -1195,33 +1065,29 @@ cmGeneratorTarget::GetCompilePDBName(const std::string& config) const std::string configProp = "COMPILE_PDB_NAME_"; configProp += configUpper; const char* config_name = this->GetProperty(configProp); - if(config_name && *config_name) - { + if (config_name && *config_name) { return prefix + config_name + ".pdb"; - } + } const char* name = this->GetProperty("COMPILE_PDB_NAME"); - if(name && *name) - { + if (name && *name) { return prefix + name + ".pdb"; - } + } return ""; } -std::string -cmGeneratorTarget::GetCompilePDBPath(const std::string& config) const +std::string cmGeneratorTarget::GetCompilePDBPath( + const std::string& config) const { std::string dir = this->GetCompilePDBDirectory(config); std::string name = this->GetCompilePDBName(config); - if(dir.empty() && !name.empty()) - { + if (dir.empty() && !name.empty()) { dir = this->GetPDBDirectory(config); - } - if(!dir.empty()) - { + } + if (!dir.empty()) { dir += "/"; - } + } return dir + name; } @@ -1234,230 +1100,189 @@ bool cmGeneratorTarget::HasSOName(const std::string& config) const this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config))); } -bool -cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const +bool cmGeneratorTarget::NeedRelinkBeforeInstall( + const std::string& config) const { // Only executables and shared libraries can have an rpath and may // need relinking. - if(this->GetType() != cmState::EXECUTABLE && - this->GetType() != cmState::SHARED_LIBRARY && - this->GetType() != cmState::MODULE_LIBRARY) - { + if (this->GetType() != cmState::EXECUTABLE && + this->GetType() != cmState::SHARED_LIBRARY && + this->GetType() != cmState::MODULE_LIBRARY) { return false; - } + } // If there is no install location this target will not be installed // and therefore does not need relinking. - if(!this->Target->GetHaveInstallRule()) - { + if (!this->Target->GetHaveInstallRule()) { return false; - } + } // If skipping all rpaths completely then no relinking is needed. - if(this->Makefile->IsOn("CMAKE_SKIP_RPATH")) - { + if (this->Makefile->IsOn("CMAKE_SKIP_RPATH")) { return false; - } + } // If building with the install-tree rpath no relinking is needed. - if(this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH")) - { + if (this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH")) { return false; - } + } // If chrpath is going to be used no relinking is needed. - if(this->IsChrpathUsed(config)) - { + if (this->IsChrpathUsed(config)) { return false; - } + } // Check for rpath support on this platform. std::string ll = this->GetLinkerLanguage(config); - if(!ll.empty()) - { + if (!ll.empty()) { std::string flagVar = "CMAKE_SHARED_LIBRARY_RUNTIME_"; flagVar += ll; flagVar += "_FLAG"; - if(!this->Makefile->IsSet(flagVar)) - { + if (!this->Makefile->IsSet(flagVar)) { // There is no rpath support on this platform so nothing needs // relinking. return false; - } } - else - { + } else { // No linker language is known. This error will be reported by // other code. return false; - } + } // If either a build or install tree rpath is set then the rpath // will likely change between the build tree and install tree and // this target must be relinked. - return this->HaveBuildTreeRPATH(config) - || this->HaveInstallTreeRPATH(); + return this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH(); } bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const { // Only certain target types have an rpath. - if(!(this->GetType() == cmState::SHARED_LIBRARY || - this->GetType() == cmState::MODULE_LIBRARY || - this->GetType() == cmState::EXECUTABLE)) - { + if (!(this->GetType() == cmState::SHARED_LIBRARY || + this->GetType() == cmState::MODULE_LIBRARY || + this->GetType() == cmState::EXECUTABLE)) { return false; - } + } // If the target will not be installed we do not need to change its // rpath. - if(!this->Target->GetHaveInstallRule()) - { + if (!this->Target->GetHaveInstallRule()) { return false; - } + } // Skip chrpath if skipping rpath altogether. - if(this->Makefile->IsOn("CMAKE_SKIP_RPATH")) - { + if (this->Makefile->IsOn("CMAKE_SKIP_RPATH")) { return false; - } + } // Skip chrpath if it does not need to be changed at install time. - if(this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH")) - { + if (this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH")) { return false; - } + } // Allow the user to disable builtin chrpath explicitly. - if(this->Makefile->IsOn("CMAKE_NO_BUILTIN_CHRPATH")) - { + if (this->Makefile->IsOn("CMAKE_NO_BUILTIN_CHRPATH")) { return false; - } + } - if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) - { + if (this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) { return true; - } + } #if defined(CMAKE_USE_ELF_PARSER) // Enable if the rpath flag uses a separator and the target uses ELF // binaries. std::string ll = this->GetLinkerLanguage(config); - if(!ll.empty()) - { + if (!ll.empty()) { std::string sepVar = "CMAKE_SHARED_LIBRARY_RUNTIME_"; sepVar += ll; sepVar += "_FLAG_SEP"; const char* sep = this->Makefile->GetDefinition(sepVar); - if(sep && *sep) - { + if (sep && *sep) { // TODO: Add ELF check to ABI detection and get rid of // CMAKE_EXECUTABLE_FORMAT. - if(const char* fmt = - this->Makefile->GetDefinition("CMAKE_EXECUTABLE_FORMAT")) - { + if (const char* fmt = + this->Makefile->GetDefinition("CMAKE_EXECUTABLE_FORMAT")) { return strcmp(fmt, "ELF") == 0; - } } } + } #endif static_cast<void>(config); return false; } bool cmGeneratorTarget::IsImportedSharedLibWithoutSOName( - const std::string& config) const + const std::string& config) const { - if(this->IsImported() && this->GetType() == cmState::SHARED_LIBRARY) - { - if(cmGeneratorTarget::ImportInfo const* info = - this->GetImportInfo(config)) - { + if (this->IsImported() && this->GetType() == cmState::SHARED_LIBRARY) { + if (cmGeneratorTarget::ImportInfo const* info = + this->GetImportInfo(config)) { return info->NoSOName; - } } + } return false; } bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir( - const std::string& config) const + const std::string& config) const { bool install_name_is_rpath = false; bool macosx_rpath = false; - if(!this->IsImported()) - { - if(this->GetType() != cmState::SHARED_LIBRARY) - { + if (!this->IsImported()) { + if (this->GetType() != cmState::SHARED_LIBRARY) { return false; - } + } const char* install_name = this->GetProperty("INSTALL_NAME_DIR"); bool use_install_name = this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"); - if(install_name && use_install_name && - std::string(install_name) == "@rpath") - { + if (install_name && use_install_name && + std::string(install_name) == "@rpath") { install_name_is_rpath = true; - } - else if(install_name && use_install_name) - { + } else if (install_name && use_install_name) { return false; - } - if(!install_name_is_rpath) - { + } + if (!install_name_is_rpath) { macosx_rpath = this->MacOSXRpathInstallNameDirDefault(); - } } - else - { + } else { // Lookup the imported soname. - if(cmGeneratorTarget::ImportInfo const* info = - this->GetImportInfo(config)) - { - if(!info->NoSOName && !info->SOName.empty()) - { - if(info->SOName.find("@rpath/") == 0) - { + if (cmGeneratorTarget::ImportInfo const* info = + this->GetImportInfo(config)) { + if (!info->NoSOName && !info->SOName.empty()) { + if (info->SOName.find("@rpath/") == 0) { install_name_is_rpath = true; - } } - else - { + } else { std::string install_name; cmSystemTools::GuessLibraryInstallName(info->Location, install_name); - if(install_name.find("@rpath") != std::string::npos) - { + if (install_name.find("@rpath") != std::string::npos) { install_name_is_rpath = true; - } } } } + } - if(!install_name_is_rpath && !macosx_rpath) - { + if (!install_name_is_rpath && !macosx_rpath) { return false; - } + } - if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG")) - { + if (!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG")) { std::ostringstream w; w << "Attempting to use"; - if(macosx_rpath) - { + if (macosx_rpath) { w << " MACOSX_RPATH"; - } - else - { + } else { w << " @rpath"; - } + } w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set."; w << " This could be because you are using a Mac OS X version"; w << " less than 10.5 or because CMake's platform configuration is"; w << " corrupt."; cmake* cm = this->LocalGenerator->GetCMakeInstance(); - cm->IssueMessage(cmake::FATAL_ERROR, w.str(), - this->GetBacktrace()); - } + cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace()); + } return true; } @@ -1465,97 +1290,78 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir( bool cmGeneratorTarget::MacOSXRpathInstallNameDirDefault() const { // we can't do rpaths when unsupported - if(!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG")) - { + if (!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG")) { return false; - } + } const char* macosx_rpath_str = this->GetProperty("MACOSX_RPATH"); - if(macosx_rpath_str) - { + if (macosx_rpath_str) { return this->GetPropertyAsBool("MACOSX_RPATH"); - } + } cmPolicies::PolicyStatus cmp0042 = this->GetPolicyStatusCMP0042(); - if(cmp0042 == cmPolicies::WARN) - { - this->LocalGenerator->GetGlobalGenerator()-> - AddCMP0042WarnTarget(this->GetName()); - } + if (cmp0042 == cmPolicies::WARN) { + this->LocalGenerator->GetGlobalGenerator()->AddCMP0042WarnTarget( + this->GetName()); + } - if(cmp0042 == cmPolicies::NEW) - { + if (cmp0042 == cmPolicies::NEW) { return true; - } + } return false; } std::string cmGeneratorTarget::GetSOName(const std::string& config) const { - if(this->IsImported()) - { + if (this->IsImported()) { // Lookup the imported soname. - if(cmGeneratorTarget::ImportInfo const* info = - this->GetImportInfo(config)) - { - if(info->NoSOName) - { + if (cmGeneratorTarget::ImportInfo const* info = + this->GetImportInfo(config)) { + if (info->NoSOName) { // The imported library has no builtin soname so the name // searched at runtime will be just the filename. return cmSystemTools::GetFilenameName(info->Location); - } - else - { + } else { // Use the soname given if any. - if(info->SOName.find("@rpath/") == 0) - { + if (info->SOName.find("@rpath/") == 0) { return info->SOName.substr(6); - } - return info->SOName; } + return info->SOName; } - else - { + } else { return ""; - } } - else - { + } else { // Compute the soname that will be built. std::string name; std::string soName; std::string realName; std::string impName; std::string pdbName; - this->GetLibraryNames(name, soName, realName, - impName, pdbName, config); + this->GetLibraryNames(name, soName, realName, impName, pdbName, config); return soName; - } + } } - -std::string -cmGeneratorTarget::GetAppBundleDirectory(const std::string& config, - bool contentOnly) const +std::string cmGeneratorTarget::GetAppBundleDirectory(const std::string& config, + bool contentOnly) const { std::string fpath = this->GetFullName(config, false); fpath += ".app"; - if(!this->Makefile->PlatformIsAppleIos()) - { + if (!this->Makefile->PlatformIsAppleIos()) { fpath += "/Contents"; - if(!contentOnly) + if (!contentOnly) fpath += "/MacOS"; - } + } return fpath; } bool cmGeneratorTarget::IsBundleOnApple() const { - return this->IsFrameworkOnApple() - || this->IsAppBundleOnApple() - || this->IsCFBundleOnApple(); + return this->IsFrameworkOnApple() || this->IsAppBundleOnApple() || + this->IsCFBundleOnApple(); } std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config, @@ -1564,119 +1370,94 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config, std::string fpath; fpath += this->GetOutputName(config, false); fpath += "."; - const char *ext = this->GetProperty("BUNDLE_EXTENSION"); - if (!ext) - { - if (this->IsXCTestOnApple()) - { + const char* ext = this->GetProperty("BUNDLE_EXTENSION"); + if (!ext) { + if (this->IsXCTestOnApple()) { ext = "xctest"; - } - else - { + } else { ext = "bundle"; - } } + } fpath += ext; - if(!this->Makefile->PlatformIsAppleIos()) - { + if (!this->Makefile->PlatformIsAppleIos()) { fpath += "/Contents"; - if(!contentOnly) + if (!contentOnly) fpath += "/MacOS"; } return fpath; } -std::string -cmGeneratorTarget::GetFrameworkDirectory(const std::string& config, - bool rootDir) const +std::string cmGeneratorTarget::GetFrameworkDirectory(const std::string& config, + bool rootDir) const { std::string fpath; fpath += this->GetOutputName(config, false); fpath += ".framework"; - if(!rootDir && !this->Makefile->PlatformIsAppleIos()) - { + if (!rootDir && !this->Makefile->PlatformIsAppleIos()) { fpath += "/Versions/"; fpath += this->GetFrameworkVersion(); - } + } return fpath; } -std::string -cmGeneratorTarget::GetFullName(const std::string& config, bool implib) const +std::string cmGeneratorTarget::GetFullName(const std::string& config, + bool implib) const { - if(this->IsImported()) - { + if (this->IsImported()) { return this->GetFullNameImported(config, implib); - } - else - { + } else { return this->GetFullNameInternal(config, implib); - } + } } -std::string -cmGeneratorTarget::GetInstallNameDirForBuildTree( - const std::string& config) const +std::string cmGeneratorTarget::GetInstallNameDirForBuildTree( + const std::string& config) const { // If building directly for installation then the build tree install_name // is the same as the install tree. - if(this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH")) - { + if (this->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH")) { return this->GetInstallNameDirForInstallTree(); - } + } // Use the build tree directory for the target. - if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME") && - !this->Makefile->IsOn("CMAKE_SKIP_RPATH") && - !this->GetPropertyAsBool("SKIP_BUILD_RPATH")) - { + if (this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME") && + !this->Makefile->IsOn("CMAKE_SKIP_RPATH") && + !this->GetPropertyAsBool("SKIP_BUILD_RPATH")) { std::string dir; - if(this->MacOSXRpathInstallNameDirDefault()) - { + if (this->MacOSXRpathInstallNameDirDefault()) { dir = "@rpath"; - } - else - { + } else { dir = this->GetDirectory(config); - } + } dir += "/"; return dir; - } - else - { + } else { return ""; - } + } } std::string cmGeneratorTarget::GetInstallNameDirForInstallTree() const { - if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) - { + if (this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) { std::string dir; const char* install_name_dir = this->GetProperty("INSTALL_NAME_DIR"); - if(!this->Makefile->IsOn("CMAKE_SKIP_RPATH") && - !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH")) - { - if(install_name_dir && *install_name_dir) - { + if (!this->Makefile->IsOn("CMAKE_SKIP_RPATH") && + !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH")) { + if (install_name_dir && *install_name_dir) { dir = install_name_dir; dir += "/"; - } } - if(!install_name_dir) - { - if(this->MacOSXRpathInstallNameDirDefault()) - { + } + if (!install_name_dir) { + if (this->MacOSXRpathInstallNameDirDefault()) { dir = "@rpath/"; - } } - return dir; } - else - { + return dir; + } else { return ""; - } + } } cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const @@ -1684,7 +1465,7 @@ cmListFileBacktrace cmGeneratorTarget::GetBacktrace() const return this->Target->GetBacktrace(); } -const std::vector<std::string>&cmGeneratorTarget::GetLinkDirectories() const +const std::vector<std::string>& cmGeneratorTarget::GetLinkDirectories() const { return this->Target->GetLinkDirectories(); } @@ -1694,16 +1475,15 @@ const std::set<std::string>& cmGeneratorTarget::GetUtilities() const return this->Target->GetUtilities(); } -const cmListFileBacktrace* -cmGeneratorTarget::GetUtilityBacktrace(const std::string& u) const +const cmListFileBacktrace* cmGeneratorTarget::GetUtilityBacktrace( + const std::string& u) const { return this->Target->GetUtilityBacktrace(u); } bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const { - return - this->GetType() == cmState::STATIC_LIBRARY || + return this->GetType() == cmState::STATIC_LIBRARY || this->GetType() == cmState::SHARED_LIBRARY || this->GetType() == cmState::MODULE_LIBRARY || this->GetType() == cmState::EXECUTABLE; @@ -1712,26 +1492,20 @@ bool cmGeneratorTarget::HaveWellDefinedOutputFiles() const const char* cmGeneratorTarget::GetExportMacro() const { // Define the symbol for targets that export symbols. - if(this->GetType() == cmState::SHARED_LIBRARY || - this->GetType() == cmState::MODULE_LIBRARY || - this->IsExecutableWithExports()) - { - if(const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL")) - { + if (this->GetType() == cmState::SHARED_LIBRARY || + this->GetType() == cmState::MODULE_LIBRARY || + this->IsExecutableWithExports()) { + if (const char* custom_export_name = this->GetProperty("DEFINE_SYMBOL")) { this->ExportMacro = custom_export_name; - } - else - { + } else { std::string in = this->GetName(); in += "_EXPORTS"; this->ExportMacro = cmSystemTools::MakeCidentifier(in); - } - return this->ExportMacro.c_str(); } - else - { + return this->ExportMacro.c_str(); + } else { return 0; - } + } } class cmTargetCollectLinkLanguages @@ -1740,29 +1514,28 @@ public: cmTargetCollectLinkLanguages(cmGeneratorTarget const* target, const std::string& config, UNORDERED_SET<std::string>& languages, - cmGeneratorTarget const* head): - Config(config), Languages(languages), HeadTarget(head), - Target(target) - { this->Visited.insert(target); } + cmGeneratorTarget const* head) + : Config(config) + , Languages(languages) + , HeadTarget(head) + , Target(target) + { + this->Visited.insert(target); + } void Visit(cmLinkItem const& item) - { - if(!item.Target) - { - if(item.find("::") != std::string::npos) - { + { + if (!item.Target) { + if (item.find("::") != std::string::npos) { bool noMessage = false; cmake::MessageType messageType = cmake::FATAL_ERROR; std::stringstream e; - switch(this->Target->GetLocalGenerator() - ->GetPolicyStatus(cmPolicies::CMP0028)) - { - case cmPolicies::WARN: - { + switch (this->Target->GetLocalGenerator()->GetPolicyStatus( + cmPolicies::CMP0028)) { + case cmPolicies::WARN: { e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0028) << "\n"; messageType = cmake::AUTHOR_WARNING; - } - break; + } break; case cmPolicies::OLD: noMessage = true; case cmPolicies::REQUIRED_IF_USED: @@ -1770,41 +1543,41 @@ public: case cmPolicies::NEW: // Issue the fatal message. break; - } + } - if(!noMessage) - { + if (!noMessage) { e << "Target \"" << this->Target->GetName() << "\" links to target \"" << item << "\" but the target was not found. Perhaps a find_package() " - "call is missing for an IMPORTED target, or an ALIAS target is " - "missing?"; + "call is missing for an IMPORTED target, or an ALIAS target is " + "missing?"; this->Target->GetLocalGenerator()->GetCMakeInstance()->IssueMessage( messageType, e.str(), this->Target->GetBacktrace()); - } } - return; } - if(!this->Visited.insert(item.Target).second) - { return; - } + } + if (!this->Visited.insert(item.Target).second) { + return; + } cmLinkInterface const* iface = item.Target->GetLinkInterface(this->Config, this->HeadTarget); - if(!iface) { return; } + if (!iface) { + return; + } - for(std::vector<std::string>::const_iterator - li = iface->Languages.begin(); li != iface->Languages.end(); ++li) - { + for (std::vector<std::string>::const_iterator li = + iface->Languages.begin(); + li != iface->Languages.end(); ++li) { this->Languages.insert(*li); - } + } - for(std::vector<cmLinkItem>::const_iterator - li = iface->Libraries.begin(); li != iface->Libraries.end(); ++li) - { + for (std::vector<cmLinkItem>::const_iterator li = iface->Libraries.begin(); + li != iface->Libraries.end(); ++li) { this->Visit(*li); - } } + } + private: std::string Config; UNORDERED_SET<std::string>& Languages; @@ -1813,19 +1586,17 @@ private: std::set<cmGeneratorTarget const*> Visited; }; -cmGeneratorTarget::LinkClosure const* -cmGeneratorTarget::GetLinkClosure(const std::string& config) const +cmGeneratorTarget::LinkClosure const* cmGeneratorTarget::GetLinkClosure( + const std::string& config) const { std::string key(cmSystemTools::UpperCase(config)); - LinkClosureMapType::iterator - i = this->LinkClosureMap.find(key); - if(i == this->LinkClosureMap.end()) - { + LinkClosureMapType::iterator i = this->LinkClosureMap.find(key); + if (i == this->LinkClosureMap.end()) { LinkClosure lc; this->ComputeLinkClosure(config, lc); LinkClosureMapType::value_type entry(key, lc); i = this->LinkClosureMap.insert(entry).first; - } + } return &i->second; } @@ -1835,49 +1606,45 @@ class cmTargetSelectLinker cmGeneratorTarget const* Target; cmGlobalGenerator* GG; std::set<std::string> Preferred; + public: cmTargetSelectLinker(cmGeneratorTarget const* target) - : Preference(0), Target(target) - { + : Preference(0) + , Target(target) + { this->GG = this->Target->GetLocalGenerator()->GetGlobalGenerator(); - } + } void Consider(const char* lang) - { + { int preference = this->GG->GetLinkerPreference(lang); - if(preference > this->Preference) - { + if (preference > this->Preference) { this->Preference = preference; this->Preferred.clear(); - } - if(preference == this->Preference) - { + } + if (preference == this->Preference) { this->Preferred.insert(lang); - } } + } std::string Choose() - { - if(this->Preferred.empty()) - { + { + if (this->Preferred.empty()) { return ""; - } - else if(this->Preferred.size() > 1) - { + } else if (this->Preferred.size() > 1) { std::stringstream e; e << "Target " << this->Target->GetName() << " contains multiple languages with the highest linker preference" << " (" << this->Preference << "):\n"; - for(std::set<std::string>::const_iterator - li = this->Preferred.begin(); li != this->Preferred.end(); ++li) - { + for (std::set<std::string>::const_iterator li = this->Preferred.begin(); + li != this->Preferred.end(); ++li) { e << " " << *li << "\n"; - } + } e << "Set the LINKER_LANGUAGE property for this target."; cmake* cm = this->Target->GetLocalGenerator()->GetCMakeInstance(); cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->Target->GetBacktrace()); - } - return *this->Preferred.begin(); } + return *this->Preferred.begin(); + } }; void cmGeneratorTarget::ComputeLinkClosure(const std::string& config, @@ -1885,64 +1652,54 @@ void cmGeneratorTarget::ComputeLinkClosure(const std::string& config, { // Get languages built in this target. UNORDERED_SET<std::string> languages; - cmLinkImplementation const* impl = - this->GetLinkImplementation(config); + cmLinkImplementation const* impl = this->GetLinkImplementation(config); assert(impl); - for(std::vector<std::string>::const_iterator li = impl->Languages.begin(); - li != impl->Languages.end(); ++li) - { + for (std::vector<std::string>::const_iterator li = impl->Languages.begin(); + li != impl->Languages.end(); ++li) { languages.insert(*li); - } + } // Add interface languages from linked targets. cmTargetCollectLinkLanguages cll(this, config, languages, this); - for(std::vector<cmLinkImplItem>::const_iterator li = impl->Libraries.begin(); - li != impl->Libraries.end(); ++li) - { + for (std::vector<cmLinkImplItem>::const_iterator li = + impl->Libraries.begin(); + li != impl->Libraries.end(); ++li) { cll.Visit(*li); - } + } // Store the transitive closure of languages. - for(UNORDERED_SET<std::string>::const_iterator li = languages.begin(); - li != languages.end(); ++li) - { + for (UNORDERED_SET<std::string>::const_iterator li = languages.begin(); + li != languages.end(); ++li) { lc.Languages.push_back(*li); - } + } // Choose the language whose linker should be used. - if(this->GetProperty("HAS_CXX")) - { + if (this->GetProperty("HAS_CXX")) { lc.LinkerLanguage = "CXX"; - } - else if(const char* linkerLang = this->GetProperty("LINKER_LANGUAGE")) - { + } else if (const char* linkerLang = this->GetProperty("LINKER_LANGUAGE")) { lc.LinkerLanguage = linkerLang; - } - else - { + } else { // Find the language with the highest preference value. cmTargetSelectLinker tsl(this); // First select from the languages compiled directly in this target. - for(std::vector<std::string>::const_iterator li = impl->Languages.begin(); - li != impl->Languages.end(); ++li) - { + for (std::vector<std::string>::const_iterator li = impl->Languages.begin(); + li != impl->Languages.end(); ++li) { tsl.Consider(li->c_str()); - } + } // Now consider languages that propagate from linked targets. - for(UNORDERED_SET<std::string>::const_iterator sit = languages.begin(); - sit != languages.end(); ++sit) - { - std::string propagates = "CMAKE_"+*sit+"_LINKER_PREFERENCE_PROPAGATES"; - if(this->Makefile->IsOn(propagates)) - { + for (UNORDERED_SET<std::string>::const_iterator sit = languages.begin(); + sit != languages.end(); ++sit) { + std::string propagates = + "CMAKE_" + *sit + "_LINKER_PREFERENCE_PROPAGATES"; + if (this->Makefile->IsOn(propagates)) { tsl.Consider(sit->c_str()); - } } + } lc.LinkerLanguage = tsl.Choose(); - } + } } void cmGeneratorTarget::GetFullNameComponents(std::string& prefix, @@ -1954,93 +1711,80 @@ 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, - bool contentOnly) const +std::string cmGeneratorTarget::BuildMacContentDirectory( + const std::string& base, const std::string& config, bool contentOnly) const { std::string fpath = base; - if(this->IsAppBundleOnApple()) - { + if (this->IsAppBundleOnApple()) { fpath += this->GetAppBundleDirectory(config, contentOnly); - } - if(this->IsFrameworkOnApple()) - { + } + if (this->IsFrameworkOnApple()) { fpath += this->GetFrameworkDirectory(config, contentOnly); - } - if(this->IsCFBundleOnApple()) - { + } + if (this->IsCFBundleOnApple()) { fpath += this->GetCFBundleDirectory(config, contentOnly); - } + } return fpath; } -std::string -cmGeneratorTarget::GetMacContentDirectory(const std::string& config, - bool implib) const +std::string cmGeneratorTarget::GetMacContentDirectory( + const std::string& config, bool implib) const { // Start with the output directory for the target. std::string fpath = this->GetDirectory(config, implib); fpath += "/"; bool contentOnly = true; - if(this->IsFrameworkOnApple()) - { + if (this->IsFrameworkOnApple()) { // additional files with a framework go into the version specific // directory contentOnly = false; - } + } fpath = this->BuildMacContentDirectory(fpath, config, contentOnly); return fpath; } - cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo( - const std::string& config) const + const std::string& config) const { // There is no compile information for imported targets. - if(this->IsImported()) - { + if (this->IsImported()) { return 0; - } + } - if(this->GetType() > cmState::OBJECT_LIBRARY) - { + if (this->GetType() > cmState::OBJECT_LIBRARY) { std::string msg = "cmTarget::GetCompileInfo called for "; msg += this->GetName(); msg += " which has type "; msg += cmState::GetTargetTypeName(this->GetType()); this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg); return 0; - } + } // Lookup/compute/cache the compile information for this configuration. std::string config_upper; - if(!config.empty()) - { + if (!config.empty()) { config_upper = cmSystemTools::UpperCase(config); - } + } CompileInfoMapType::const_iterator i = this->CompileInfoMap.find(config_upper); - if(i == this->CompileInfoMap.end()) - { + if (i == this->CompileInfoMap.end()) { CompileInfo info; this->ComputePDBOutputDir("COMPILE_PDB", config, info.CompilePdbDir); CompileInfoMapType::value_type entry(config_upper, info); i = this->CompileInfoMap.insert(entry).first; - } + } return &i->second; } -cmSourceFile const* -cmGeneratorTarget::GetModuleDefinitionFile(const std::string& config) const +cmSourceFile const* cmGeneratorTarget::GetModuleDefinitionFile( + const std::string& config) const { std::vector<cmSourceFile const*> data; IMPLEMENT_VISIT_IMPL(ModuleDefinitionFile, COMMA std::vector<cmSourceFile const*>) - if(!data.empty()) - { + if (!data.empty()) { return data.front(); - } + } return 0; } @@ -2050,115 +1794,97 @@ bool cmGeneratorTarget::IsDLLPlatform() const return this->DLLPlatform; } -void -cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs, - const std::string &config) const +void cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs, + const std::string& config) const { std::vector<cmSourceFile const*> objectFiles; this->GetExternalObjects(objectFiles, config); std::vector<cmGeneratorTarget*> objectLibraries; - for(std::vector<cmSourceFile const*>::const_iterator - it = objectFiles.begin(); it != objectFiles.end(); ++it) - { + for (std::vector<cmSourceFile const*>::const_iterator it = + objectFiles.begin(); + it != objectFiles.end(); ++it) { std::string objLib = (*it)->GetObjectLibrary(); if (cmGeneratorTarget* tgt = - this->LocalGenerator->FindGeneratorTargetToUse(objLib)) - { + this->LocalGenerator->FindGeneratorTargetToUse(objLib)) { objectLibraries.push_back(tgt); - } } + } - std::vector<cmGeneratorTarget*>::const_iterator end - = cmRemoveDuplicates(objectLibraries); + std::vector<cmGeneratorTarget*>::const_iterator end = + cmRemoveDuplicates(objectLibraries); - for(std::vector<cmGeneratorTarget*>::const_iterator - ti = objectLibraries.begin(); - ti != end; ++ti) - { + for (std::vector<cmGeneratorTarget*>::const_iterator ti = + objectLibraries.begin(); + ti != end; ++ti) { cmGeneratorTarget* ogt = *ti; std::vector<cmSourceFile const*> objectSources; ogt->GetObjectSources(objectSources, config); - for(std::vector<cmSourceFile const*>::const_iterator - si = objectSources.begin(); - si != objectSources.end(); ++si) - { + for (std::vector<cmSourceFile const*>::const_iterator si = + objectSources.begin(); + si != objectSources.end(); ++si) { std::string obj = ogt->ObjectDirectory; obj += ogt->Objects[*si]; objs.push_back(obj); - } } + } } -void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string> &result, - const std::string& config) const +void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string>& result, + const std::string& config) const { - const char *prop - = this->GetLinkInterfaceDependentStringProperty("AUTOUIC_OPTIONS", - config); - if (!prop) - { + const char* prop = + this->GetLinkInterfaceDependentStringProperty("AUTOUIC_OPTIONS", config); + if (!prop) { return; - } + } cmGeneratorExpression ge; - cmGeneratorExpressionDAGChecker dagChecker( - this->GetName(), - "AUTOUIC_OPTIONS", 0, 0); - cmSystemTools::ExpandListArgument(ge.Parse(prop) - ->Evaluate(this->LocalGenerator, - config, - false, - this, - &dagChecker), - result); + cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), + "AUTOUIC_OPTIONS", 0, 0); + cmSystemTools::ExpandListArgument( + ge.Parse(prop)->Evaluate(this->LocalGenerator, config, false, this, + &dagChecker), + result); } void processILibs(const std::string& config, - cmGeneratorTarget const* headTarget, - cmLinkItem const& item, + cmGeneratorTarget const* headTarget, cmLinkItem const& item, cmGlobalGenerator* gg, std::vector<cmGeneratorTarget const*>& tgts, std::set<cmGeneratorTarget const*>& emitted) { - if (item.Target && emitted.insert(item.Target).second) - { + if (item.Target && emitted.insert(item.Target).second) { tgts.push_back(item.Target); - if(cmLinkInterfaceLibraries const* iface = - item.Target->GetLinkInterfaceLibraries(config, headTarget, true)) - { - for(std::vector<cmLinkItem>::const_iterator - it = iface->Libraries.begin(); - it != iface->Libraries.end(); ++it) - { + if (cmLinkInterfaceLibraries const* iface = + item.Target->GetLinkInterfaceLibraries(config, headTarget, true)) { + for (std::vector<cmLinkItem>::const_iterator it = + iface->Libraries.begin(); + it != iface->Libraries.end(); ++it) { processILibs(config, headTarget, *it, gg, tgts, emitted); - } } } + } } const std::vector<const cmGeneratorTarget*>& cmGeneratorTarget::GetLinkImplementationClosure( - const std::string& config) const + const std::string& config) const { - LinkImplClosure& tgts = - this->LinkImplClosureMap[config]; - if(!tgts.Done) - { + LinkImplClosure& tgts = this->LinkImplClosureMap[config]; + if (!tgts.Done) { tgts.Done = true; std::set<cmGeneratorTarget const*> emitted; - cmLinkImplementationLibraries const* impl - = this->GetLinkImplementationLibraries(config); + cmLinkImplementationLibraries const* impl = + this->GetLinkImplementationLibraries(config); - for(std::vector<cmLinkImplItem>::const_iterator - it = impl->Libraries.begin(); - it != impl->Libraries.end(); ++it) - { + for (std::vector<cmLinkImplItem>::const_iterator it = + impl->Libraries.begin(); + it != impl->Libraries.end(); ++it) { processILibs(config, this, *it, - this->LocalGenerator->GetGlobalGenerator(), - tgts , emitted); - } + this->LocalGenerator->GetGlobalGenerator(), tgts, emitted); } + } return tgts; } @@ -2167,6 +1893,7 @@ class cmTargetTraceDependencies public: cmTargetTraceDependencies(cmGeneratorTarget* target); void Trace(); + private: cmGeneratorTarget* GeneratorTarget; cmMakefile* Makefile; @@ -2191,9 +1918,8 @@ private: std::set<std::string>& emitted); }; -cmTargetTraceDependencies -::cmTargetTraceDependencies(cmGeneratorTarget* target): - GeneratorTarget(target) +cmTargetTraceDependencies::cmTargetTraceDependencies(cmGeneratorTarget* target) + : GeneratorTarget(target) { // Convenience. this->Makefile = target->Target->GetMakefile(); @@ -2202,78 +1928,66 @@ cmTargetTraceDependencies this->CurrentEntry = 0; // Queue all the source files already specified for the target. - if (target->GetType() != cmState::INTERFACE_LIBRARY) - { + if (target->GetType() != cmState::INTERFACE_LIBRARY) { std::vector<std::string> configs; this->Makefile->GetConfigurations(configs); - if (configs.empty()) - { + if (configs.empty()) { configs.push_back(""); - } + } std::set<cmSourceFile*> emitted; - for(std::vector<std::string>::const_iterator ci = configs.begin(); - ci != configs.end(); ++ci) - { + for (std::vector<std::string>::const_iterator ci = configs.begin(); + ci != configs.end(); ++ci) { std::vector<cmSourceFile*> sources; this->GeneratorTarget->GetSourceFiles(sources, *ci); - for(std::vector<cmSourceFile*>::const_iterator si = sources.begin(); - si != sources.end(); ++si) - { + for (std::vector<cmSourceFile*>::const_iterator si = sources.begin(); + si != sources.end(); ++si) { cmSourceFile* sf = *si; const std::set<cmGeneratorTarget const*> tgts = - this->GlobalGenerator->GetFilenameTargetDepends(sf); - if (tgts.find(this->GeneratorTarget) != tgts.end()) - { + this->GlobalGenerator->GetFilenameTargetDepends(sf); + if (tgts.find(this->GeneratorTarget) != tgts.end()) { std::ostringstream e; e << "Evaluation output file\n \"" << sf->GetFullPath() << "\"\ndepends on the sources of a target it is used in. This " - "is a dependency loop and is not allowed."; - this->GeneratorTarget - ->LocalGenerator->IssueMessage(cmake::FATAL_ERROR, e.str()); + "is a dependency loop and is not allowed."; + this->GeneratorTarget->LocalGenerator->IssueMessage( + cmake::FATAL_ERROR, e.str()); return; - } - if(emitted.insert(sf).second && this->SourcesQueued.insert(sf).second) - { + } + if (emitted.insert(sf).second && + this->SourcesQueued.insert(sf).second) { this->SourceQueue.push(sf); - } } } } + } // Queue pre-build, pre-link, and post-build rule dependencies. - this->CheckCustomCommands( - this->GeneratorTarget->GetPreBuildCommands()); - this->CheckCustomCommands( - this->GeneratorTarget->GetPreLinkCommands()); - this->CheckCustomCommands( - this->GeneratorTarget->GetPostBuildCommands()); + this->CheckCustomCommands(this->GeneratorTarget->GetPreBuildCommands()); + this->CheckCustomCommands(this->GeneratorTarget->GetPreLinkCommands()); + this->CheckCustomCommands(this->GeneratorTarget->GetPostBuildCommands()); } void cmTargetTraceDependencies::Trace() { // Process one dependency at a time until the queue is empty. - while(!this->SourceQueue.empty()) - { + while (!this->SourceQueue.empty()) { // Get the next source from the queue. cmSourceFile* sf = this->SourceQueue.front(); this->SourceQueue.pop(); this->CurrentEntry = &this->GeneratorTarget->SourceDepends[sf]; // Queue dependencies added explicitly by the user. - if(const char* additionalDeps = sf->GetProperty("OBJECT_DEPENDS")) - { + if (const char* additionalDeps = sf->GetProperty("OBJECT_DEPENDS")) { std::vector<std::string> objDeps; cmSystemTools::ExpandListArgument(additionalDeps, objDeps); - for(std::vector<std::string>::iterator odi = objDeps.begin(); - odi != objDeps.end(); ++odi) - { - if (cmSystemTools::FileIsFullPath(*odi)) - { + for (std::vector<std::string>::iterator odi = objDeps.begin(); + odi != objDeps.end(); ++odi) { + if (cmSystemTools::FileIsFullPath(*odi)) { *odi = cmSystemTools::CollapseFullPath(*odi); - } } - this->FollowNames(objDeps); } + this->FollowNames(objDeps); + } // Queue the source needed to generate this file, if any. this->FollowName(sf->GetFullPath()); @@ -2282,11 +1996,10 @@ void cmTargetTraceDependencies::Trace() this->FollowNames(sf->GetDepends()); // Queue custom command dependencies. - if(cmCustomCommand const* cc = sf->GetCustomCommand()) - { + if (cmCustomCommand const* cc = sf->GetCustomCommand()) { this->CheckCustomCommand(*cc); - } } + } this->CurrentEntry = 0; this->GeneratorTarget->AddTracedSources(this->NewSources); @@ -2294,44 +2007,39 @@ void cmTargetTraceDependencies::Trace() void cmTargetTraceDependencies::QueueSource(cmSourceFile* sf) { - if(this->SourcesQueued.insert(sf).second) - { + if (this->SourcesQueued.insert(sf).second) { this->SourceQueue.push(sf); // Make sure this file is in the target at the end. this->NewSources.push_back(sf->GetFullPath()); - } + } } void cmTargetTraceDependencies::FollowName(std::string const& name) { NameMapType::iterator i = this->NameMap.find(name); - if(i == this->NameMap.end()) - { + if (i == this->NameMap.end()) { // Check if we know how to generate this file. cmSourceFile* sf = this->Makefile->GetSourceFileWithOutput(name); NameMapType::value_type entry(name, sf); i = this->NameMap.insert(entry).first; - } - if(cmSourceFile* sf = i->second) - { + } + if (cmSourceFile* sf = i->second) { // Record the dependency we just followed. - if(this->CurrentEntry) - { + if (this->CurrentEntry) { this->CurrentEntry->Depends.push_back(sf); - } - this->QueueSource(sf); } + this->QueueSource(sf); + } } -void -cmTargetTraceDependencies::FollowNames(std::vector<std::string> const& names) +void cmTargetTraceDependencies::FollowNames( + std::vector<std::string> const& names) { - for(std::vector<std::string>::const_iterator i = names.begin(); - i != names.end(); ++i) - { + for (std::vector<std::string>::const_iterator i = names.begin(); + i != names.end(); ++i) { this->FollowName(*i); - } + } } bool cmTargetTraceDependencies::IsUtility(std::string const& dep) @@ -2343,24 +2051,20 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep) // that case the target name will be the file basename of the // dependency. std::string util = cmSystemTools::GetFilenameName(dep); - if(cmSystemTools::GetFilenameLastExtension(util) == ".exe") - { + if (cmSystemTools::GetFilenameLastExtension(util) == ".exe") { util = cmSystemTools::GetFilenameWithoutLastExtension(util); - } + } // Check for a target with this name. - if(cmGeneratorTarget* t - = this->GeneratorTarget-> - GetLocalGenerator()->FindGeneratorTargetToUse(util)) - { + if (cmGeneratorTarget* t = + this->GeneratorTarget->GetLocalGenerator()->FindGeneratorTargetToUse( + util)) { // If we find the target and the dep was given as a full path, // then make sure it was not a full path to something else, and // the fact that the name matched a target was just a coincidence. - if(cmSystemTools::FileIsFullPath(dep.c_str())) - { - if(t->GetType() >= cmState::EXECUTABLE && - t->GetType() <= cmState::MODULE_LIBRARY) - { + if (cmSystemTools::FileIsFullPath(dep.c_str())) { + if (t->GetType() >= cmState::EXECUTABLE && + t->GetType() <= cmState::MODULE_LIBRARY) { // This is really only for compatibility so we do not need to // worry about configuration names and output names. std::string tLocation = t->GetLocationForBuild(); @@ -2368,29 +2072,24 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep) std::string depLocation = cmSystemTools::GetFilenamePath(dep); depLocation = cmSystemTools::CollapseFullPath(depLocation); tLocation = cmSystemTools::CollapseFullPath(tLocation); - if(depLocation == tLocation) - { + if (depLocation == tLocation) { this->GeneratorTarget->Target->AddUtility(util); return true; - } } } - else - { + } else { // The original name of the dependency was not a full path. It // must name a target, so add the target-level dependency. this->GeneratorTarget->Target->AddUtility(util); return true; - } } + } // The dependency does not name a target built in this project. return false; } -void -cmTargetTraceDependencies -::CheckCustomCommand(cmCustomCommand const& cc) +void cmTargetTraceDependencies::CheckCustomCommand(cmCustomCommand const& cc) { // Transform command names that reference targets built in this // project to corresponding target-level dependencies. @@ -2399,91 +2098,79 @@ cmTargetTraceDependencies // Add target-level dependencies referenced by generator expressions. std::set<cmGeneratorTarget*> targets; - for(cmCustomCommandLines::const_iterator cit = cc.GetCommandLines().begin(); - cit != cc.GetCommandLines().end(); ++cit) - { + for (cmCustomCommandLines::const_iterator cit = cc.GetCommandLines().begin(); + cit != cc.GetCommandLines().end(); ++cit) { std::string const& command = *cit->begin(); // Check for a target with this name. - if(cmGeneratorTarget* t = - this->LocalGenerator->FindGeneratorTargetToUse(command)) - { - if(t->GetType() == cmState::EXECUTABLE) - { + if (cmGeneratorTarget* t = + this->LocalGenerator->FindGeneratorTargetToUse(command)) { + if (t->GetType() == cmState::EXECUTABLE) { // The command refers to an executable target built in // this project. Add the target-level dependency to make // sure the executable is up to date before this custom // command possibly runs. this->GeneratorTarget->Target->AddUtility(command); - } } + } // Check for target references in generator expressions. - for(cmCustomCommandLine::const_iterator cli = cit->begin(); - cli != cit->end(); ++cli) - { - const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge - = ge.Parse(*cli); + for (cmCustomCommandLine::const_iterator cli = cit->begin(); + cli != cit->end(); ++cli) { + const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = + ge.Parse(*cli); cge->Evaluate(this->GeneratorTarget->GetLocalGenerator(), "", true); std::set<cmGeneratorTarget*> geTargets = cge->GetTargets(); targets.insert(geTargets.begin(), geTargets.end()); - } } + } - for(std::set<cmGeneratorTarget*>::iterator ti = targets.begin(); - ti != targets.end(); ++ti) - { + for (std::set<cmGeneratorTarget*>::iterator ti = targets.begin(); + ti != targets.end(); ++ti) { this->GeneratorTarget->Target->AddUtility((*ti)->GetName()); - } + } // Queue the custom command dependencies. std::vector<std::string> configs; std::set<std::string> emitted; this->Makefile->GetConfigurations(configs); - if (configs.empty()) - { + if (configs.empty()) { configs.push_back(""); - } - for(std::vector<std::string>::const_iterator ci = configs.begin(); - ci != configs.end(); ++ci) - { + } + for (std::vector<std::string>::const_iterator ci = configs.begin(); + ci != configs.end(); ++ci) { this->FollowCommandDepends(cc, *ci, emitted); - } + } } -void cmTargetTraceDependencies::FollowCommandDepends(cmCustomCommand const& cc, - const std::string& config, - std::set<std::string>& emitted) +void cmTargetTraceDependencies::FollowCommandDepends( + cmCustomCommand const& cc, const std::string& config, + std::set<std::string>& emitted) { cmCustomCommandGenerator ccg(cc, config, this->GeneratorTarget->LocalGenerator); const std::vector<std::string>& depends = ccg.GetDepends(); - for(std::vector<std::string>::const_iterator di = depends.begin(); - di != depends.end(); ++di) - { + for (std::vector<std::string>::const_iterator di = depends.begin(); + di != depends.end(); ++di) { std::string const& dep = *di; - if(emitted.insert(dep).second) - { - if(!this->IsUtility(dep)) - { + if (emitted.insert(dep).second) { + if (!this->IsUtility(dep)) { // The dependency does not name a target and may be a file we // know how to generate. Queue it. this->FollowName(dep); - } } } + } } -void -cmTargetTraceDependencies -::CheckCustomCommands(const std::vector<cmCustomCommand>& commands) +void cmTargetTraceDependencies::CheckCustomCommands( + const std::vector<cmCustomCommand>& commands) { - for(std::vector<cmCustomCommand>::const_iterator cli = commands.begin(); - cli != commands.end(); ++cli) - { + for (std::vector<cmCustomCommand>::const_iterator cli = commands.begin(); + cli != commands.end(); ++cli) { this->CheckCustomCommand(*cli); - } + } } void cmGeneratorTarget::TraceDependencies() @@ -2492,66 +2179,55 @@ void cmGeneratorTarget::TraceDependencies() // would find nothing anyway, but when building CMake itself the "install" // target command ends up referencing the "cmake" target but we do not // really want the dependency because "install" depend on "all" anyway. - if(this->GetType() == cmState::GLOBAL_TARGET) - { + if (this->GetType() == cmState::GLOBAL_TARGET) { return; - } + } // Use a helper object to trace the dependencies. cmTargetTraceDependencies tracer(this); tracer.Trace(); } -std::string -cmGeneratorTarget::GetCompilePDBDirectory(const std::string& config) const +std::string cmGeneratorTarget::GetCompilePDBDirectory( + const std::string& config) const { - if(CompileInfo const* info = this->GetCompileInfo(config)) - { + if (CompileInfo const* info = this->GetCompileInfo(config)) { return info->CompilePdbDir; - } + } return ""; } void cmGeneratorTarget::GetAppleArchs(const std::string& config, - std::vector<std::string>& archVec) const + std::vector<std::string>& archVec) const { const char* archs = 0; - if(!config.empty()) - { + if (!config.empty()) { std::string defVarName = "OSX_ARCHITECTURES_"; defVarName += cmSystemTools::UpperCase(config); archs = this->GetProperty(defVarName); - } - if(!archs) - { + } + if (!archs) { archs = this->GetProperty("OSX_ARCHITECTURES"); - } - if(archs) - { + } + if (archs) { cmSystemTools::ExpandListArgument(std::string(archs), archVec); - } + } } -std::string -cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang, - std::string const& config) const +std::string cmGeneratorTarget::GetCreateRuleVariable( + std::string const& lang, std::string const& config) const { - switch(this->GetType()) - { - case cmState::STATIC_LIBRARY: - { + switch (this->GetType()) { + case cmState::STATIC_LIBRARY: { std::string var = "CMAKE_" + lang + "_CREATE_STATIC_LIBRARY"; - if(this->GetFeatureAsBool( - "INTERPROCEDURAL_OPTIMIZATION", config)) - { + if (this->GetFeatureAsBool("INTERPROCEDURAL_OPTIMIZATION", config)) { std::string varIPO = var + "_IPO"; - if(this->Makefile->GetDefinition(varIPO)) - { + if (this->Makefile->GetDefinition(varIPO)) { return varIPO; - } } - return var; } + return var; + } case cmState::SHARED_LIBRARY: return "CMAKE_" + lang + "_CREATE_SHARED_LIBRARY"; case cmState::MODULE_LIBRARY: @@ -2560,46 +2236,39 @@ cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang, return "CMAKE_" + lang + "_LINK_EXECUTABLE"; default: break; - } + } return ""; } -static void processIncludeDirectories(cmGeneratorTarget const* tgt, - const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, - std::vector<std::string> &includes, - UNORDERED_SET<std::string> &uniqueIncludes, - cmGeneratorExpressionDAGChecker *dagChecker, - const std::string& config, bool debugIncludes, - const std::string& language) -{ - for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator - it = entries.begin(), end = entries.end(); it != end; ++it) - { +static void processIncludeDirectories( + cmGeneratorTarget const* tgt, + const std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries, + std::vector<std::string>& includes, + UNORDERED_SET<std::string>& uniqueIncludes, + cmGeneratorExpressionDAGChecker* dagChecker, const std::string& config, + bool debugIncludes, const std::string& language) +{ + for (std::vector<cmGeneratorTarget::TargetPropertyEntry *>::const_iterator + it = entries.begin(), + end = entries.end(); + it != end; ++it) { cmLinkImplItem const& item = (*it)->LinkImplItem; std::string const& targetName = item; bool const fromImported = item.Target && item.Target->IsImported(); bool const checkCMP0027 = item.FromGenex; std::vector<std::string> entryIncludes; - cmSystemTools::ExpandListArgument((*it)->ge->Evaluate( - tgt->GetLocalGenerator(), - config, - false, - tgt, - dagChecker, language), - entryIncludes); + cmSystemTools::ExpandListArgument( + (*it)->ge->Evaluate(tgt->GetLocalGenerator(), config, false, tgt, + dagChecker, language), + entryIncludes); std::string usedIncludes; - for(std::vector<std::string>::iterator - li = entryIncludes.begin(); li != entryIncludes.end(); ++li) - { - if (fromImported - && !cmSystemTools::FileExists(li->c_str())) - { + for (std::vector<std::string>::iterator li = entryIncludes.begin(); + li != entryIncludes.end(); ++li) { + if (fromImported && !cmSystemTools::FileExists(li->c_str())) { std::ostringstream e; cmake::MessageType messageType = cmake::FATAL_ERROR; - if (checkCMP0027) - { - switch(tgt->GetPolicyStatusCMP0027()) - { + if (checkCMP0027) { + switch (tgt->GetPolicyStatusCMP0027()) { case cmPolicies::WARN: e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0027) << "\n"; case cmPolicies::OLD: @@ -2609,8 +2278,8 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt, case cmPolicies::REQUIRED_IF_USED: case cmPolicies::NEW: break; - } } + } /* clang-format off */ e << "Imported target \"" << targetName << "\" includes " "non-existent path\n \"" << *li << "\"\nin its " @@ -2624,31 +2293,24 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt, /* clang-format on */ tgt->GetLocalGenerator()->IssueMessage(messageType, e.str()); return; - } + } - if (!cmSystemTools::FileIsFullPath(li->c_str())) - { + if (!cmSystemTools::FileIsFullPath(li->c_str())) { std::ostringstream e; bool noMessage = false; cmake::MessageType messageType = cmake::FATAL_ERROR; - if (!targetName.empty()) - { + if (!targetName.empty()) { /* clang-format off */ e << "Target \"" << targetName << "\" contains relative " "path in its INTERFACE_INCLUDE_DIRECTORIES:\n" " \"" << *li << "\""; /* clang-format on */ - } - else - { - switch(tgt->GetPolicyStatusCMP0021()) - { - case cmPolicies::WARN: - { + } else { + switch (tgt->GetPolicyStatusCMP0021()) { + case cmPolicies::WARN: { e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0021) << "\n"; messageType = cmake::AUTHOR_WARNING; - } - break; + } break; case cmPolicies::OLD: noMessage = true; case cmPolicies::REQUIRED_IF_USED: @@ -2656,48 +2318,42 @@ static void processIncludeDirectories(cmGeneratorTarget const* tgt, case cmPolicies::NEW: // Issue the fatal message. break; - } - e << "Found relative path while evaluating include directories of " - "\"" << tgt->GetName() << "\":\n \"" << *li << "\"\n"; } - if (!noMessage) - { + e << "Found relative path while evaluating include directories of " + "\"" + << tgt->GetName() << "\":\n \"" << *li << "\"\n"; + } + if (!noMessage) { tgt->GetLocalGenerator()->IssueMessage(messageType, e.str()); - if (messageType == cmake::FATAL_ERROR) - { + if (messageType == cmake::FATAL_ERROR) { return; - } } } + } - if (!cmSystemTools::IsOff(li->c_str())) - { + if (!cmSystemTools::IsOff(li->c_str())) { cmSystemTools::ConvertToUnixSlashes(*li); - } + } std::string inc = *li; - if(uniqueIncludes.insert(inc).second) - { + if (uniqueIncludes.insert(inc).second) { includes.push_back(inc); - if (debugIncludes) - { + if (debugIncludes) { usedIncludes += " * " + inc + "\n"; - } } } - if (!usedIncludes.empty()) - { - tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(cmake::LOG, - std::string("Used includes for target ") - + tgt->GetName() + ":\n" - + usedIncludes, (*it)->ge->GetBacktrace()); - } } + if (!usedIncludes.empty()) { + tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage( + cmake::LOG, std::string("Used includes for target ") + tgt->GetName() + + ":\n" + usedIncludes, + (*it)->ge->GetBacktrace()); + } + } } -std::vector<std::string> -cmGeneratorTarget::GetIncludeDirectories(const std::string& config, - const std::string& lang) const +std::vector<std::string> cmGeneratorTarget::GetIncludeDirectories( + const std::string& config, const std::string& lang) const { std::vector<std::string> includes; UNORDERED_SET<std::string> uniqueIncludes; @@ -2706,142 +2362,114 @@ cmGeneratorTarget::GetIncludeDirectories(const std::string& config, "INCLUDE_DIRECTORIES", 0, 0); std::vector<std::string> debugProperties; - const char *debugProp = - this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); - if (debugProp) - { + const char* debugProp = + this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); + if (debugProp) { cmSystemTools::ExpandListArgument(debugProp, debugProperties); - } + } - bool debugIncludes = !this->DebugIncludesDone - && std::find(debugProperties.begin(), - debugProperties.end(), - "INCLUDE_DIRECTORIES") - != debugProperties.end(); + bool debugIncludes = !this->DebugIncludesDone && + std::find(debugProperties.begin(), debugProperties.end(), + "INCLUDE_DIRECTORIES") != debugProperties.end(); - if (this->GlobalGenerator->GetConfigureDoneCMP0026()) - { + if (this->GlobalGenerator->GetConfigureDoneCMP0026()) { this->DebugIncludesDone = true; - } + } - processIncludeDirectories(this, - this->IncludeDirectoriesEntries, - includes, - uniqueIncludes, - &dagChecker, - config, - debugIncludes, + processIncludeDirectories(this, this->IncludeDirectoriesEntries, includes, + uniqueIncludes, &dagChecker, config, debugIncludes, lang); std::vector<cmGeneratorTarget::TargetPropertyEntry*> linkInterfaceIncludeDirectoriesEntries; - AddInterfaceEntries( - this, config, "INTERFACE_INCLUDE_DIRECTORIES", - linkInterfaceIncludeDirectoriesEntries); + AddInterfaceEntries(this, config, "INTERFACE_INCLUDE_DIRECTORIES", + linkInterfaceIncludeDirectoriesEntries); - if(this->Makefile->IsOn("APPLE")) - { + if (this->Makefile->IsOn("APPLE")) { cmLinkImplementationLibraries const* impl = - this->GetLinkImplementationLibraries(config); - for(std::vector<cmLinkImplItem>::const_iterator - it = impl->Libraries.begin(); - it != impl->Libraries.end(); ++it) - { + this->GetLinkImplementationLibraries(config); + for (std::vector<cmLinkImplItem>::const_iterator it = + impl->Libraries.begin(); + it != impl->Libraries.end(); ++it) { std::string libDir = cmSystemTools::CollapseFullPath(*it); - static cmsys::RegularExpression - frameworkCheck("(.*\\.framework)(/Versions/[^/]+)?/[^/]+$"); - if(!frameworkCheck.find(libDir)) - { + static cmsys::RegularExpression frameworkCheck( + "(.*\\.framework)(/Versions/[^/]+)?/[^/]+$"); + if (!frameworkCheck.find(libDir)) { continue; - } + } libDir = frameworkCheck.match(1); cmGeneratorExpression ge; cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = - ge.Parse(libDir.c_str()); - linkInterfaceIncludeDirectoriesEntries - .push_back(new cmGeneratorTarget::TargetPropertyEntry(cge)); - } + ge.Parse(libDir.c_str()); + linkInterfaceIncludeDirectoriesEntries.push_back( + new cmGeneratorTarget::TargetPropertyEntry(cge)); } + } - processIncludeDirectories(this, - linkInterfaceIncludeDirectoriesEntries, - includes, - uniqueIncludes, - &dagChecker, - config, - debugIncludes, - lang); + processIncludeDirectories(this, linkInterfaceIncludeDirectoriesEntries, + includes, uniqueIncludes, &dagChecker, config, + debugIncludes, lang); cmDeleteAll(linkInterfaceIncludeDirectoriesEntries); return includes; } -static void processCompileOptionsInternal(cmGeneratorTarget const* tgt, - const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, - std::vector<std::string> &options, - UNORDERED_SET<std::string> &uniqueOptions, - cmGeneratorExpressionDAGChecker *dagChecker, - const std::string& config, bool debugOptions, const char *logName, - std::string const& language) +static void processCompileOptionsInternal( + cmGeneratorTarget const* tgt, + const std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries, + std::vector<std::string>& options, UNORDERED_SET<std::string>& uniqueOptions, + cmGeneratorExpressionDAGChecker* dagChecker, const std::string& config, + bool debugOptions, const char* logName, std::string const& language) { - for (std::vector<cmGeneratorTarget::TargetPropertyEntry*>::const_iterator - it = entries.begin(), end = entries.end(); it != end; ++it) - { + for (std::vector<cmGeneratorTarget::TargetPropertyEntry *>::const_iterator + it = entries.begin(), + end = entries.end(); + it != end; ++it) { std::vector<std::string> entryOptions; - cmSystemTools::ExpandListArgument((*it)->ge->Evaluate( - tgt->GetLocalGenerator(), - config, - false, - tgt, - dagChecker, - language), - entryOptions); + cmSystemTools::ExpandListArgument( + (*it)->ge->Evaluate(tgt->GetLocalGenerator(), config, false, tgt, + dagChecker, language), + entryOptions); std::string usedOptions; - for(std::vector<std::string>::iterator - li = entryOptions.begin(); li != entryOptions.end(); ++li) - { + for (std::vector<std::string>::iterator li = entryOptions.begin(); + li != entryOptions.end(); ++li) { std::string const& opt = *li; - if(uniqueOptions.insert(opt).second) - { + if (uniqueOptions.insert(opt).second) { options.push_back(opt); - if (debugOptions) - { + if (debugOptions) { usedOptions += " * " + opt + "\n"; - } } } - if (!usedOptions.empty()) - { - tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage(cmake::LOG, - std::string("Used compile ") + logName - + std::string(" for target ") - + tgt->GetName() + ":\n" - + usedOptions, (*it)->ge->GetBacktrace()); - } } + if (!usedOptions.empty()) { + tgt->GetLocalGenerator()->GetCMakeInstance()->IssueMessage( + cmake::LOG, std::string("Used compile ") + logName + + std::string(" for target ") + tgt->GetName() + ":\n" + usedOptions, + (*it)->ge->GetBacktrace()); + } + } } -static void processCompileOptions(cmGeneratorTarget const* tgt, - const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, - std::vector<std::string> &options, - UNORDERED_SET<std::string> &uniqueOptions, - cmGeneratorExpressionDAGChecker *dagChecker, - const std::string& config, bool debugOptions, - std::string const& language) +static void processCompileOptions( + cmGeneratorTarget const* tgt, + const std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries, + std::vector<std::string>& options, UNORDERED_SET<std::string>& uniqueOptions, + cmGeneratorExpressionDAGChecker* dagChecker, const std::string& config, + bool debugOptions, std::string const& language) { processCompileOptionsInternal(tgt, entries, options, uniqueOptions, dagChecker, config, debugOptions, "options", language); } -void cmGeneratorTarget::GetCompileOptions(std::vector<std::string> &result, - const std::string& config, - const std::string& language) const +void cmGeneratorTarget::GetCompileOptions(std::vector<std::string>& result, + const std::string& config, + const std::string& language) const { UNORDERED_SET<std::string> uniqueOptions; @@ -2849,133 +2477,101 @@ void cmGeneratorTarget::GetCompileOptions(std::vector<std::string> &result, "COMPILE_OPTIONS", 0, 0); std::vector<std::string> debugProperties; - const char *debugProp = - this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); - if (debugProp) - { + const char* debugProp = + this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); + if (debugProp) { cmSystemTools::ExpandListArgument(debugProp, debugProperties); - } + } - bool debugOptions = !this->DebugCompileOptionsDone - && std::find(debugProperties.begin(), - debugProperties.end(), - "COMPILE_OPTIONS") - != debugProperties.end(); + bool debugOptions = !this->DebugCompileOptionsDone && + std::find(debugProperties.begin(), debugProperties.end(), + "COMPILE_OPTIONS") != debugProperties.end(); - if (this->GlobalGenerator->GetConfigureDoneCMP0026()) - { + if (this->GlobalGenerator->GetConfigureDoneCMP0026()) { this->DebugCompileOptionsDone = true; - } + } - processCompileOptions(this, - this->CompileOptionsEntries, - result, - uniqueOptions, - &dagChecker, - config, - debugOptions, - language); + processCompileOptions(this, this->CompileOptionsEntries, result, + uniqueOptions, &dagChecker, config, debugOptions, + language); std::vector<cmGeneratorTarget::TargetPropertyEntry*> linkInterfaceCompileOptionsEntries; - AddInterfaceEntries( - this, config, "INTERFACE_COMPILE_OPTIONS", - linkInterfaceCompileOptionsEntries); - - processCompileOptions(this, - linkInterfaceCompileOptionsEntries, - result, - uniqueOptions, - &dagChecker, - config, - debugOptions, - language); + AddInterfaceEntries(this, config, "INTERFACE_COMPILE_OPTIONS", + linkInterfaceCompileOptionsEntries); + + processCompileOptions(this, linkInterfaceCompileOptionsEntries, result, + uniqueOptions, &dagChecker, config, debugOptions, + language); cmDeleteAll(linkInterfaceCompileOptionsEntries); } -static void processCompileFeatures(cmGeneratorTarget const* tgt, - const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, - std::vector<std::string> &options, - UNORDERED_SET<std::string> &uniqueOptions, - cmGeneratorExpressionDAGChecker *dagChecker, - const std::string& config, bool debugOptions) +static void processCompileFeatures( + cmGeneratorTarget const* tgt, + const std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries, + std::vector<std::string>& options, UNORDERED_SET<std::string>& uniqueOptions, + cmGeneratorExpressionDAGChecker* dagChecker, const std::string& config, + bool debugOptions) { processCompileOptionsInternal(tgt, entries, options, uniqueOptions, dagChecker, config, debugOptions, "features", std::string()); } -void cmGeneratorTarget::GetCompileFeatures(std::vector<std::string> &result, - const std::string& config) const +void cmGeneratorTarget::GetCompileFeatures(std::vector<std::string>& result, + const std::string& config) const { UNORDERED_SET<std::string> uniqueFeatures; cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), - "COMPILE_FEATURES", - 0, 0); + "COMPILE_FEATURES", 0, 0); std::vector<std::string> debugProperties; - const char *debugProp = - this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); - if (debugProp) - { + const char* debugProp = + this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); + if (debugProp) { cmSystemTools::ExpandListArgument(debugProp, debugProperties); - } + } - bool debugFeatures = !this->DebugCompileFeaturesDone - && std::find(debugProperties.begin(), - debugProperties.end(), - "COMPILE_FEATURES") - != debugProperties.end(); + bool debugFeatures = !this->DebugCompileFeaturesDone && + std::find(debugProperties.begin(), debugProperties.end(), + "COMPILE_FEATURES") != debugProperties.end(); - if (this->GlobalGenerator->GetConfigureDoneCMP0026()) - { + if (this->GlobalGenerator->GetConfigureDoneCMP0026()) { this->DebugCompileFeaturesDone = true; - } + } - processCompileFeatures(this, - this->CompileFeaturesEntries, - result, - uniqueFeatures, - &dagChecker, - config, - debugFeatures); + processCompileFeatures(this, this->CompileFeaturesEntries, result, + uniqueFeatures, &dagChecker, config, debugFeatures); std::vector<cmGeneratorTarget::TargetPropertyEntry*> linkInterfaceCompileFeaturesEntries; - AddInterfaceEntries( - this, config, "INTERFACE_COMPILE_FEATURES", - linkInterfaceCompileFeaturesEntries); - - processCompileFeatures(this, - linkInterfaceCompileFeaturesEntries, - result, - uniqueFeatures, - &dagChecker, - config, - debugFeatures); + AddInterfaceEntries(this, config, "INTERFACE_COMPILE_FEATURES", + linkInterfaceCompileFeaturesEntries); + + processCompileFeatures(this, linkInterfaceCompileFeaturesEntries, result, + uniqueFeatures, &dagChecker, config, debugFeatures); cmDeleteAll(linkInterfaceCompileFeaturesEntries); } -static void processCompileDefinitions(cmGeneratorTarget const* tgt, - const std::vector<cmGeneratorTarget::TargetPropertyEntry*> &entries, - std::vector<std::string> &options, - UNORDERED_SET<std::string> &uniqueOptions, - cmGeneratorExpressionDAGChecker *dagChecker, - const std::string& config, bool debugOptions, - std::string const& language) +static void processCompileDefinitions( + cmGeneratorTarget const* tgt, + const std::vector<cmGeneratorTarget::TargetPropertyEntry*>& entries, + std::vector<std::string>& options, UNORDERED_SET<std::string>& uniqueOptions, + cmGeneratorExpressionDAGChecker* dagChecker, const std::string& config, + bool debugOptions, std::string const& language) { processCompileOptionsInternal(tgt, entries, options, uniqueOptions, dagChecker, config, debugOptions, "definitions", language); } -void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list, - const std::string& config, - const std::string& language) const +void cmGeneratorTarget::GetCompileDefinitions( + std::vector<std::string>& list, const std::string& config, + const std::string& language) const { UNORDERED_SET<std::string> uniqueOptions; @@ -2983,90 +2579,66 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list, "COMPILE_DEFINITIONS", 0, 0); std::vector<std::string> debugProperties; - const char *debugProp = - this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); - if (debugProp) - { + const char* debugProp = + this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); + if (debugProp) { cmSystemTools::ExpandListArgument(debugProp, debugProperties); - } + } - bool debugDefines = !this->DebugCompileDefinitionsDone - && std::find(debugProperties.begin(), - debugProperties.end(), - "COMPILE_DEFINITIONS") - != debugProperties.end(); + bool debugDefines = !this->DebugCompileDefinitionsDone && + std::find(debugProperties.begin(), debugProperties.end(), + "COMPILE_DEFINITIONS") != debugProperties.end(); - if (this->GlobalGenerator->GetConfigureDoneCMP0026()) - { + if (this->GlobalGenerator->GetConfigureDoneCMP0026()) { this->DebugCompileDefinitionsDone = true; - } + } - processCompileDefinitions(this, - this->CompileDefinitionsEntries, - list, - uniqueOptions, - &dagChecker, - config, - debugDefines, + processCompileDefinitions(this, this->CompileDefinitionsEntries, list, + uniqueOptions, &dagChecker, config, debugDefines, language); std::vector<cmGeneratorTarget::TargetPropertyEntry*> linkInterfaceCompileDefinitionsEntries; - AddInterfaceEntries( - this, config, "INTERFACE_COMPILE_DEFINITIONS", - linkInterfaceCompileDefinitionsEntries); - if (!config.empty()) - { - std::string configPropName = "COMPILE_DEFINITIONS_" - + cmSystemTools::UpperCase(config); - const char *configProp = this->GetProperty(configPropName); - if (configProp) - { - switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0043)) - { - case cmPolicies::WARN: - { + AddInterfaceEntries(this, config, "INTERFACE_COMPILE_DEFINITIONS", + linkInterfaceCompileDefinitionsEntries); + if (!config.empty()) { + std::string configPropName = + "COMPILE_DEFINITIONS_" + cmSystemTools::UpperCase(config); + const char* configProp = this->GetProperty(configPropName); + if (configProp) { + switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0043)) { + case cmPolicies::WARN: { std::ostringstream e; e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0043); - this->LocalGenerator->IssueMessage(cmake::AUTHOR_WARNING, - e.str()); - } - case cmPolicies::OLD: - { + this->LocalGenerator->IssueMessage(cmake::AUTHOR_WARNING, e.str()); + } + case cmPolicies::OLD: { cmGeneratorExpression ge; cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = - ge.Parse(configProp); - linkInterfaceCompileDefinitionsEntries - .push_back(new cmGeneratorTarget::TargetPropertyEntry(cge)); - } - break; + ge.Parse(configProp); + linkInterfaceCompileDefinitionsEntries.push_back( + new cmGeneratorTarget::TargetPropertyEntry(cge)); + } break; case cmPolicies::NEW: case cmPolicies::REQUIRED_ALWAYS: case cmPolicies::REQUIRED_IF_USED: break; - } } } + } - processCompileDefinitions(this, - linkInterfaceCompileDefinitionsEntries, - list, - uniqueOptions, - &dagChecker, - config, - debugDefines, + processCompileDefinitions(this, linkInterfaceCompileDefinitionsEntries, list, + uniqueOptions, &dagChecker, config, debugDefines, language); cmDeleteAll(linkInterfaceCompileDefinitionsEntries); } -void cmGeneratorTarget::ComputeTargetManifest( - const std::string& config) const +void cmGeneratorTarget::ComputeTargetManifest(const std::string& config) const { - if (this->IsImported()) - { + if (this->IsImported()) { return; - } + } cmGlobalGenerator* gg = this->LocalGenerator->GetGlobalGenerator(); // Get the names. @@ -3075,75 +2647,61 @@ void cmGeneratorTarget::ComputeTargetManifest( std::string realName; std::string impName; std::string pdbName; - if(this->GetType() == cmState::EXECUTABLE) - { + if (this->GetType() == cmState::EXECUTABLE) { this->GetExecutableNames(name, realName, impName, pdbName, config); - } - else if(this->GetType() == cmState::STATIC_LIBRARY || - this->GetType() == cmState::SHARED_LIBRARY || - this->GetType() == cmState::MODULE_LIBRARY) - { - this->GetLibraryNames(name, soName, realName, impName, pdbName, - config); - } - else - { + } else if (this->GetType() == cmState::STATIC_LIBRARY || + this->GetType() == cmState::SHARED_LIBRARY || + this->GetType() == cmState::MODULE_LIBRARY) { + this->GetLibraryNames(name, soName, realName, impName, pdbName, config); + } else { return; - } + } // Get the directory. std::string dir = this->GetDirectory(config, false); // Add each name. std::string f; - if(!name.empty()) - { + if (!name.empty()) { f = dir; f += "/"; f += name; gg->AddToManifest(f); - } - if(!soName.empty()) - { + } + if (!soName.empty()) { f = dir; f += "/"; f += soName; gg->AddToManifest(f); - } - if(!realName.empty()) - { + } + if (!realName.empty()) { f = dir; f += "/"; f += realName; gg->AddToManifest(f); - } - if(!pdbName.empty()) - { + } + if (!pdbName.empty()) { f = dir; f += "/"; f += pdbName; gg->AddToManifest(f); - } - if(!impName.empty()) - { + } + if (!impName.empty()) { f = this->GetDirectory(config, true); f += "/"; f += impName; gg->AddToManifest(f); - } + } } std::string cmGeneratorTarget::GetFullPath(const std::string& config, bool implib, bool realname) const { - if(this->IsImported()) - { + if (this->IsImported()) { return this->Target->ImportedGetFullPath(config, implib); - } - else - { + } else { return this->NormalGetFullPath(config, implib, realname); - } + } } std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config, @@ -3152,43 +2710,35 @@ std::string cmGeneratorTarget::NormalGetFullPath(const std::string& config, { std::string fpath = this->GetDirectory(config, implib); fpath += "/"; - if(this->IsAppBundleOnApple()) - { + if (this->IsAppBundleOnApple()) { fpath = this->BuildMacContentDirectory(fpath, config, false); fpath += "/"; - } + } // Add the full name of the target. - if(implib) - { + if (implib) { fpath += this->GetFullName(config, true); - } - else if(realname) - { + } else if (realname) { fpath += this->NormalGetRealName(config); - } - else - { + } else { fpath += this->GetFullName(config, false); - } + } return fpath; } -std::string -cmGeneratorTarget::NormalGetRealName(const std::string& config) const +std::string cmGeneratorTarget::NormalGetRealName( + const std::string& config) const { // This should not be called for imported targets. // TODO: Split cmTarget into a class hierarchy to get compile-time // enforcement of the limited imported target API. - if(this->IsImported()) - { - std::string msg = "NormalGetRealName called on imported target: "; + if (this->IsImported()) { + std::string msg = "NormalGetRealName called on imported target: "; msg += this->GetName(); this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg); - } + } - if(this->GetType() == cmState::EXECUTABLE) - { + if (this->GetType() == cmState::EXECUTABLE) { // Compute the real name that will be built. std::string name; std::string realName; @@ -3196,63 +2746,54 @@ cmGeneratorTarget::NormalGetRealName(const std::string& config) const std::string pdbName; this->GetExecutableNames(name, realName, impName, pdbName, config); return realName; - } - else - { + } else { // Compute the real name that will be built. std::string name; std::string soName; std::string realName; std::string impName; std::string pdbName; - this->GetLibraryNames(name, soName, realName, - impName, pdbName, config); + this->GetLibraryNames(name, soName, realName, impName, pdbName, config); return realName; - } + } } -void cmGeneratorTarget::GetLibraryNames(std::string& name, - std::string& soName, - std::string& realName, - std::string& impName, - std::string& pdbName, - const std::string& config) const +void cmGeneratorTarget::GetLibraryNames(std::string& name, std::string& soName, + std::string& realName, + std::string& impName, + std::string& pdbName, + const std::string& config) const { // This should not be called for imported targets. // TODO: Split cmTarget into a class hierarchy to get compile-time // enforcement of the limited imported target API. - if(this->IsImported()) - { - std::string msg = "GetLibraryNames called on imported target: "; + if (this->IsImported()) { + std::string msg = "GetLibraryNames called on imported target: "; msg += this->GetName(); - this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, - msg); + this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg); return; - } + } // Check for library version properties. const char* version = this->GetProperty("VERSION"); const char* soversion = this->GetProperty("SOVERSION"); - if(!this->HasSOName(config) || - this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") || - this->IsFrameworkOnApple()) - { + if (!this->HasSOName(config) || + this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") || + this->IsFrameworkOnApple()) { // Versioning is supported only for shared libraries and modules, // and then only when the platform supports an soname flag. version = 0; soversion = 0; - } - if(version && !soversion) - { + } + if (version && !soversion) { // The soversion must be set if the library version is set. Use // the library version as the soversion. soversion = version; - } - if(!version && soversion) - { + } + if (!version && soversion) { // Use the soversion as the library version. version = soversion; - } + } // Get the components of the library name. std::string prefix; @@ -3261,74 +2802,63 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name, this->GetFullNameInternal(config, false, prefix, base, suffix); // The library name. - name = prefix+base+suffix; + name = prefix + base + suffix; - if(this->IsFrameworkOnApple()) - { + if (this->IsFrameworkOnApple()) { realName = prefix; - if(!this->Makefile->PlatformIsAppleIos()) - { + if (!this->Makefile->PlatformIsAppleIos()) { realName += "Versions/"; realName += this->GetFrameworkVersion(); realName += "/"; - } + } realName += base; soName = realName; - } - else - { + } else { // The library's soname. - this->ComputeVersionedName(soName, prefix, base, suffix, - name, soversion); + this->ComputeVersionedName(soName, prefix, base, suffix, name, soversion); // The library's real name on disk. - this->ComputeVersionedName(realName, prefix, base, suffix, - name, version); + this->ComputeVersionedName(realName, prefix, base, suffix, name, version); } // The import library name. - if(this->GetType() == cmState::SHARED_LIBRARY || - this->GetType() == cmState::MODULE_LIBRARY) - { + if (this->GetType() == cmState::SHARED_LIBRARY || + this->GetType() == cmState::MODULE_LIBRARY) { impName = this->GetFullNameInternal(config, true); - } - else - { + } else { impName = ""; - } + } // The program database file name. pdbName = this->GetPDBName(config); } void cmGeneratorTarget::GetExecutableNames(std::string& name, - std::string& realName, - std::string& impName, - std::string& pdbName, - const std::string& config) const + std::string& realName, + std::string& impName, + std::string& pdbName, + const std::string& config) const { // This should not be called for imported targets. // TODO: Split cmTarget into a class hierarchy to get compile-time // enforcement of the limited imported target API. - if(this->IsImported()) - { - std::string msg = - "GetExecutableNames called on imported target: "; + if (this->IsImported()) { + std::string msg = "GetExecutableNames called on imported target: "; msg += this->GetName(); this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg); - } + } - // This versioning is supported only for executables and then only - // when the platform supports symbolic links. +// This versioning is supported only for executables and then only +// when the platform supports symbolic links. #if defined(_WIN32) && !defined(__CYGWIN__) const char* version = 0; #else // Check for executable version properties. const char* version = this->GetProperty("VERSION"); - if(this->GetType() != cmState::EXECUTABLE || this->Makefile->IsOn("XCODE")) - { + if (this->GetType() != cmState::EXECUTABLE || + this->Makefile->IsOn("XCODE")) { version = 0; - } + } #endif // Get the components of the executable name. @@ -3338,19 +2868,18 @@ void cmGeneratorTarget::GetExecutableNames(std::string& name, this->GetFullNameInternal(config, false, prefix, base, suffix); // The executable name. - name = prefix+base+suffix; + name = prefix + base + suffix; - // The executable's real name on disk. +// The executable's real name on disk. #if defined(__CYGWIN__) - realName = prefix+base; + realName = prefix + base; #else realName = name; #endif - if(version) - { + if (version) { realName += "-"; realName += version; - } + } #if defined(__CYGWIN__) realName += suffix; #endif @@ -3369,11 +2898,11 @@ std::string cmGeneratorTarget::GetFullNameInternal(const std::string& config, std::string base; std::string suffix; this->GetFullNameInternal(config, implib, prefix, base, suffix); - return prefix+base+suffix; + return prefix + base + suffix; } -const char* -cmGeneratorTarget::ImportedGetLocation(const std::string& config) const +const char* cmGeneratorTarget::ImportedGetLocation( + const std::string& config) const { static std::string location; assert(this->IsImported()); @@ -3395,132 +2924,115 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config, std::string& outSuffix) const { // Use just the target name for non-main target types. - if(this->GetType() != cmState::STATIC_LIBRARY && - this->GetType() != cmState::SHARED_LIBRARY && - this->GetType() != cmState::MODULE_LIBRARY && - this->GetType() != cmState::EXECUTABLE) - { + if (this->GetType() != cmState::STATIC_LIBRARY && + this->GetType() != cmState::SHARED_LIBRARY && + this->GetType() != cmState::MODULE_LIBRARY && + this->GetType() != cmState::EXECUTABLE) { outPrefix = ""; outBase = this->GetName(); outSuffix = ""; return; - } + } // Return an empty name for the import library if this platform // does not support import libraries. - if(implib && - !this->Makefile->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")) - { + if (implib && + !this->Makefile->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")) { outPrefix = ""; outBase = ""; outSuffix = ""; return; - } + } // The implib option is only allowed for shared libraries, module // libraries, and executables. - if(this->GetType() != cmState::SHARED_LIBRARY && - this->GetType() != cmState::MODULE_LIBRARY && - this->GetType() != cmState::EXECUTABLE) - { + if (this->GetType() != cmState::SHARED_LIBRARY && + this->GetType() != cmState::MODULE_LIBRARY && + this->GetType() != cmState::EXECUTABLE) { implib = false; - } + } // Compute the full name for main target types. - const char* targetPrefix = (implib - ? this->GetProperty("IMPORT_PREFIX") - : this->GetProperty("PREFIX")); - const char* targetSuffix = (implib - ? this->GetProperty("IMPORT_SUFFIX") - : this->GetProperty("SUFFIX")); + const char* targetPrefix = (implib ? this->GetProperty("IMPORT_PREFIX") + : this->GetProperty("PREFIX")); + const char* targetSuffix = (implib ? this->GetProperty("IMPORT_SUFFIX") + : this->GetProperty("SUFFIX")); const char* configPostfix = 0; - if(!config.empty()) - { + if (!config.empty()) { std::string configProp = cmSystemTools::UpperCase(config); configProp += "_POSTFIX"; configPostfix = this->GetProperty(configProp); // Mac application bundles and frameworks have no postfix. - if(configPostfix && - (this->IsAppBundleOnApple() || this->IsFrameworkOnApple())) - { + if (configPostfix && + (this->IsAppBundleOnApple() || this->IsFrameworkOnApple())) { configPostfix = 0; - } } + } const char* prefixVar = this->Target->GetPrefixVariableInternal(implib); const char* suffixVar = this->Target->GetSuffixVariableInternal(implib); // Check for language-specific default prefix and suffix. std::string ll = this->GetLinkerLanguage(config); - if(!ll.empty()) - { - if(!targetSuffix && suffixVar && *suffixVar) - { + if (!ll.empty()) { + if (!targetSuffix && suffixVar && *suffixVar) { std::string langSuff = suffixVar + std::string("_") + ll; targetSuffix = this->Makefile->GetDefinition(langSuff); - } - if(!targetPrefix && prefixVar && *prefixVar) - { + } + if (!targetPrefix && prefixVar && *prefixVar) { std::string langPrefix = prefixVar + std::string("_") + ll; targetPrefix = this->Makefile->GetDefinition(langPrefix); - } } + } // if there is no prefix on the target use the cmake definition - if(!targetPrefix && prefixVar) - { + if (!targetPrefix && prefixVar) { targetPrefix = this->Makefile->GetSafeDefinition(prefixVar); - } + } // if there is no suffix on the target use the cmake definition - if(!targetSuffix && suffixVar) - { + if (!targetSuffix && suffixVar) { targetSuffix = this->Makefile->GetSafeDefinition(suffixVar); - } + } // frameworks have directory prefix but no suffix std::string fw_prefix; - if(this->IsFrameworkOnApple()) - { + if (this->IsFrameworkOnApple()) { fw_prefix = this->GetOutputName(config, false); fw_prefix += ".framework/"; targetPrefix = fw_prefix.c_str(); targetSuffix = 0; - } + } - if(this->IsCFBundleOnApple()) - { + if (this->IsCFBundleOnApple()) { fw_prefix = this->GetCFBundleDirectory(config, false); fw_prefix += "/"; targetPrefix = fw_prefix.c_str(); targetSuffix = 0; - } + } // Begin the final name with the prefix. - outPrefix = targetPrefix?targetPrefix:""; + outPrefix = targetPrefix ? targetPrefix : ""; // Append the target name or property-specified name. outBase += this->GetOutputName(config, implib); // Append the per-configuration postfix. - outBase += configPostfix?configPostfix:""; + outBase += configPostfix ? configPostfix : ""; // Name shared libraries with their version number on some platforms. - if(const char* soversion = this->GetProperty("SOVERSION")) - { - if(this->GetType() == cmState::SHARED_LIBRARY && !implib && - this->Makefile->IsOn("CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION")) - { + if (const char* soversion = this->GetProperty("SOVERSION")) { + if (this->GetType() == cmState::SHARED_LIBRARY && !implib && + this->Makefile->IsOn("CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION")) { outBase += "-"; outBase += soversion; - } } + } // Append the suffix. - outSuffix = targetSuffix?targetSuffix:""; + outSuffix = targetSuffix ? targetSuffix : ""; } - -std::string -cmGeneratorTarget::GetLinkerLanguage(const std::string& config) const +std::string cmGeneratorTarget::GetLinkerLanguage( + const std::string& config) const { return this->GetLinkClosure(config)->LinkerLanguage; } @@ -3533,38 +3045,33 @@ std::string cmGeneratorTarget::GetPDBName(const std::string& config) const this->GetFullNameInternal(config, false, prefix, base, suffix); std::vector<std::string> props; - std::string configUpper = - cmSystemTools::UpperCase(config); - if(!configUpper.empty()) - { + std::string configUpper = cmSystemTools::UpperCase(config); + if (!configUpper.empty()) { // PDB_NAME_<CONFIG> props.push_back("PDB_NAME_" + configUpper); - } + } // PDB_NAME props.push_back("PDB_NAME"); - for(std::vector<std::string>::const_iterator i = props.begin(); - i != props.end(); ++i) - { - if(const char* outName = this->GetProperty(*i)) - { + for (std::vector<std::string>::const_iterator i = props.begin(); + i != props.end(); ++i) { + if (const char* outName = this->GetProperty(*i)) { base = outName; break; - } } - return prefix+base+".pdb"; + } + return prefix + base + ".pdb"; } bool cmGeneratorTarget::StrictTargetComparison::operator()( - cmGeneratorTarget const* t1, cmGeneratorTarget const* t2) const + cmGeneratorTarget const* t1, cmGeneratorTarget const* t2) const { int nameResult = strcmp(t1->GetName().c_str(), t2->GetName().c_str()); - if (nameResult == 0) - { + if (nameResult == 0) { return strcmp(t1->GetLocalGenerator()->GetCurrentBinaryDirectory(), t2->GetLocalGenerator()->GetCurrentBinaryDirectory()) < 0; - } + } return nameResult < 0; } @@ -3575,93 +3082,75 @@ cmGeneratorTarget::GetTargetSourceFileFlags(const cmSourceFile* sf) const this->ConstructSourceFileFlags(); std::map<cmSourceFile const*, SourceFileFlags>::iterator si = this->SourceFlagsMap.find(sf); - if(si != this->SourceFlagsMap.end()) - { + if (si != this->SourceFlagsMap.end()) { flags = si->second; - } - else - { + } else { // Handle the MACOSX_PACKAGE_LOCATION property on source files that // were not listed in one of the other lists. - if(const char* location = sf->GetProperty("MACOSX_PACKAGE_LOCATION")) - { + if (const char* location = sf->GetProperty("MACOSX_PACKAGE_LOCATION")) { flags.MacFolder = location; - if(strcmp(location, "Resources") == 0) - { + if (strcmp(location, "Resources") == 0) { flags.Type = cmGeneratorTarget::SourceFileTypeResource; - } - else - { + } else { flags.Type = cmGeneratorTarget::SourceFileTypeMacContent; - } } } + } return flags; } void cmGeneratorTarget::ConstructSourceFileFlags() const { - if(this->SourceFileFlagsConstructed) - { + if (this->SourceFileFlagsConstructed) { return; - } + } this->SourceFileFlagsConstructed = true; // Process public headers to mark the source files. - if(const char* files = this->GetProperty("PUBLIC_HEADER")) - { + if (const char* files = this->GetProperty("PUBLIC_HEADER")) { std::vector<std::string> relFiles; cmSystemTools::ExpandListArgument(files, relFiles); - for(std::vector<std::string>::iterator it = relFiles.begin(); - it != relFiles.end(); ++it) - { - if(cmSourceFile* sf = this->Makefile->GetSource(*it)) - { + for (std::vector<std::string>::iterator it = relFiles.begin(); + it != relFiles.end(); ++it) { + if (cmSourceFile* sf = this->Makefile->GetSource(*it)) { SourceFileFlags& flags = this->SourceFlagsMap[sf]; flags.MacFolder = "Headers"; flags.Type = cmGeneratorTarget::SourceFileTypePublicHeader; - } } } + } // Process private headers after public headers so that they take // precedence if a file is listed in both. - if(const char* files = this->GetProperty("PRIVATE_HEADER")) - { + if (const char* files = this->GetProperty("PRIVATE_HEADER")) { std::vector<std::string> relFiles; cmSystemTools::ExpandListArgument(files, relFiles); - for(std::vector<std::string>::iterator it = relFiles.begin(); - it != relFiles.end(); ++it) - { - if(cmSourceFile* sf = this->Makefile->GetSource(*it)) - { + for (std::vector<std::string>::iterator it = relFiles.begin(); + it != relFiles.end(); ++it) { + if (cmSourceFile* sf = this->Makefile->GetSource(*it)) { SourceFileFlags& flags = this->SourceFlagsMap[sf]; flags.MacFolder = "PrivateHeaders"; flags.Type = cmGeneratorTarget::SourceFileTypePrivateHeader; - } } } + } // Mark sources listed as resources. - if(const char* files = this->GetProperty("RESOURCE")) - { + if (const char* files = this->GetProperty("RESOURCE")) { std::vector<std::string> relFiles; cmSystemTools::ExpandListArgument(files, relFiles); - for(std::vector<std::string>::iterator it = relFiles.begin(); - it != relFiles.end(); ++it) - { - if(cmSourceFile* sf = this->Makefile->GetSource(*it)) - { + for (std::vector<std::string>::iterator it = relFiles.begin(); + it != relFiles.end(); ++it) { + if (cmSourceFile* sf = this->Makefile->GetSource(*it)) { SourceFileFlags& flags = this->SourceFlagsMap[sf]; flags.MacFolder = ""; - if(!this->Makefile->PlatformIsAppleIos()) - { + if (!this->Makefile->PlatformIsAppleIos()) { flags.MacFolder = "Resources"; - } - flags.Type = cmGeneratorTarget::SourceFileTypeResource; } + flags.Type = cmGeneratorTarget::SourceFileTypeResource; } } + } } const cmGeneratorTarget::CompatibleInterfacesBase& @@ -3669,74 +3158,68 @@ cmGeneratorTarget::GetCompatibleInterfaces(std::string const& config) const { cmGeneratorTarget::CompatibleInterfaces& compat = this->CompatibleInterfacesMap[config]; - if(!compat.Done) - { + if (!compat.Done) { compat.Done = true; compat.PropsBool.insert("POSITION_INDEPENDENT_CODE"); compat.PropsString.insert("AUTOUIC_OPTIONS"); std::vector<cmGeneratorTarget const*> const& deps = this->GetLinkImplementationClosure(config); - for(std::vector<cmGeneratorTarget const*>::const_iterator li = - deps.begin(); li != deps.end(); ++li) - { -#define CM_READ_COMPATIBLE_INTERFACE(X, x) \ - if(const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) \ - { \ - std::vector<std::string> props; \ - cmSystemTools::ExpandListArgument(prop, props); \ - compat.Props##x.insert(props.begin(), props.end()); \ - } + for (std::vector<cmGeneratorTarget const*>::const_iterator li = + deps.begin(); + li != deps.end(); ++li) { +#define CM_READ_COMPATIBLE_INTERFACE(X, x) \ + if (const char* prop = (*li)->GetProperty("COMPATIBLE_INTERFACE_" #X)) { \ + std::vector<std::string> props; \ + cmSystemTools::ExpandListArgument(prop, props); \ + compat.Props##x.insert(props.begin(), props.end()); \ + } CM_READ_COMPATIBLE_INTERFACE(BOOL, Bool) CM_READ_COMPATIBLE_INTERFACE(STRING, String) CM_READ_COMPATIBLE_INTERFACE(NUMBER_MIN, NumberMin) CM_READ_COMPATIBLE_INTERFACE(NUMBER_MAX, NumberMax) #undef CM_READ_COMPATIBLE_INTERFACE - } } + } return compat; } bool cmGeneratorTarget::IsLinkInterfaceDependentBoolProperty( - const std::string &p, const std::string& config) const + const std::string& p, const std::string& config) const { - if (this->GetType() == cmState::OBJECT_LIBRARY - || this->GetType() == cmState::INTERFACE_LIBRARY) - { + if (this->GetType() == cmState::OBJECT_LIBRARY || + this->GetType() == cmState::INTERFACE_LIBRARY) { return false; - } + } return this->GetCompatibleInterfaces(config).PropsBool.count(p) > 0; } bool cmGeneratorTarget::IsLinkInterfaceDependentStringProperty( - const std::string &p, const std::string& config) const + const std::string& p, const std::string& config) const { - if (this->GetType() == cmState::OBJECT_LIBRARY - || this->GetType() == cmState::INTERFACE_LIBRARY) - { + if (this->GetType() == cmState::OBJECT_LIBRARY || + this->GetType() == cmState::INTERFACE_LIBRARY) { return false; - } + } return this->GetCompatibleInterfaces(config).PropsString.count(p) > 0; } bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMinProperty( - const std::string &p, const std::string& config) const + const std::string& p, const std::string& config) const { - if (this->GetType() == cmState::OBJECT_LIBRARY - || this->GetType() == cmState::INTERFACE_LIBRARY) - { + if (this->GetType() == cmState::OBJECT_LIBRARY || + this->GetType() == cmState::INTERFACE_LIBRARY) { return false; - } + } return this->GetCompatibleInterfaces(config).PropsNumberMin.count(p) > 0; } bool cmGeneratorTarget::IsLinkInterfaceDependentNumberMaxProperty( - const std::string &p, const std::string& config) const + const std::string& p, const std::string& config) const { - if (this->GetType() == cmState::OBJECT_LIBRARY - || this->GetType() == cmState::INTERFACE_LIBRARY) - { + if (this->GetType() == cmState::OBJECT_LIBRARY || + this->GetType() == cmState::INTERFACE_LIBRARY) { return false; - } + } return this->GetCompatibleInterfaces(config).PropsNumberMax.count(p) > 0; } @@ -3748,109 +3231,100 @@ enum CompatibleType NumberMaxType }; -template<typename PropertyType> +template <typename PropertyType> PropertyType getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt, const std::string& prop, const std::string& config, - CompatibleType, - PropertyType *); + CompatibleType, PropertyType*); -template<> +template <> bool getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt, const std::string& prop, const std::string& config, - CompatibleType, bool *) + CompatibleType, bool*) { return tgt->GetLinkInterfaceDependentBoolProperty(prop, config); } -template<> -const char * getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt, - const std::string& prop, - const std::string& config, - CompatibleType t, - const char **) +template <> +const char* getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt, + const std::string& prop, + const std::string& config, + CompatibleType t, const char**) { - switch(t) - { - case BoolType: - assert(0 && "String compatibility check function called for boolean"); - return 0; - case StringType: - return tgt->GetLinkInterfaceDependentStringProperty(prop, config); - case NumberMinType: - return tgt->GetLinkInterfaceDependentNumberMinProperty(prop, config); - case NumberMaxType: - return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config); + switch (t) { + case BoolType: + assert(0 && "String compatibility check function called for boolean"); + return 0; + case StringType: + return tgt->GetLinkInterfaceDependentStringProperty(prop, config); + case NumberMinType: + return tgt->GetLinkInterfaceDependentNumberMinProperty(prop, config); + case NumberMaxType: + return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config); } assert(0 && "Unreachable!"); return 0; } -template<typename PropertyType> +template <typename PropertyType> void checkPropertyConsistency(cmGeneratorTarget const* depender, cmGeneratorTarget const* dependee, const std::string& propName, - std::set<std::string> &emitted, - const std::string& config, - CompatibleType t, - PropertyType *) -{ - const char *prop = dependee->GetProperty(propName); - if (!prop) - { + std::set<std::string>& emitted, + const std::string& config, CompatibleType t, + PropertyType*) +{ + const char* prop = dependee->GetProperty(propName); + if (!prop) { return; - } + } std::vector<std::string> props; cmSystemTools::ExpandListArgument(prop, props); std::string pdir = cmSystemTools::GetCMakeRoot(); pdir += "/Help/prop_tgt/"; - for(std::vector<std::string>::iterator pi = props.begin(); - pi != props.end(); ++pi) - { + for (std::vector<std::string>::iterator pi = props.begin(); + pi != props.end(); ++pi) { std::string pname = cmSystemTools::HelpFileName(*pi); std::string pfile = pdir + pname + ".rst"; - if(cmSystemTools::FileExists(pfile.c_str(), true)) - { + if (cmSystemTools::FileExists(pfile.c_str(), true)) { std::ostringstream e; - e << "Target \"" << dependee->GetName() << "\" has property \"" - << *pi << "\" listed in its " << propName << " property. " - "This is not allowed. Only user-defined properties may appear " - "listed in the " << propName << " property."; + e << "Target \"" << dependee->GetName() << "\" has property \"" << *pi + << "\" listed in its " << propName + << " property. " + "This is not allowed. Only user-defined properties may appear " + "listed in the " + << propName << " property."; depender->GetLocalGenerator()->IssueMessage(cmake::FATAL_ERROR, e.str()); return; - } - if(emitted.insert(*pi).second) - { - getLinkInterfaceDependentProperty<PropertyType>(depender, *pi, config, - t, 0); - if (cmSystemTools::GetErrorOccuredFlag()) - { + } + if (emitted.insert(*pi).second) { + getLinkInterfaceDependentProperty<PropertyType>(depender, *pi, config, t, + 0); + if (cmSystemTools::GetErrorOccuredFlag()) { return; - } } } + } } -static std::string intersect(const std::set<std::string> &s1, - const std::set<std::string> &s2) +static std::string intersect(const std::set<std::string>& s1, + const std::set<std::string>& s2) { std::set<std::string> intersect; - std::set_intersection(s1.begin(),s1.end(), - s2.begin(),s2.end(), - std::inserter(intersect,intersect.begin())); - if (!intersect.empty()) - { + std::set_intersection(s1.begin(), s1.end(), s2.begin(), s2.end(), + std::inserter(intersect, intersect.begin())); + if (!intersect.empty()) { return *intersect.begin(); - } + } return ""; } -static std::string intersect(const std::set<std::string> &s1, - const std::set<std::string> &s2, - const std::set<std::string> &s3) +static std::string intersect(const std::set<std::string>& s1, + const std::set<std::string>& s2, + const std::set<std::string>& s3) { std::string result; result = intersect(s1, s2); @@ -3862,10 +3336,10 @@ static std::string intersect(const std::set<std::string> &s1, return intersect(s2, s3); } -static std::string intersect(const std::set<std::string> &s1, - const std::set<std::string> &s2, - const std::set<std::string> &s3, - const std::set<std::string> &s4) +static std::string intersect(const std::set<std::string>& s1, + const std::set<std::string>& s2, + const std::set<std::string>& s3, + const std::set<std::string>& s4) { std::string result; result = intersect(s1, s2); @@ -3881,9 +3355,9 @@ static std::string intersect(const std::set<std::string> &s1, } void cmGeneratorTarget::CheckPropertyCompatibility( - cmComputeLinkInformation *info, const std::string& config) const + cmComputeLinkInformation* info, const std::string& config) const { - const cmComputeLinkInformation::ItemVector &deps = info->GetItems(); + const cmComputeLinkInformation::ItemVector& deps = info->GetItems(); std::set<std::string> emittedBools; static std::string strBool = "COMPATIBLE_INTERFACE_BOOL"; @@ -3894,96 +3368,77 @@ void cmGeneratorTarget::CheckPropertyCompatibility( std::set<std::string> emittedMaxNumbers; static std::string strNumMax = "COMPATIBLE_INTERFACE_NUMBER_MAX"; - for(cmComputeLinkInformation::ItemVector::const_iterator li = - deps.begin(); li != deps.end(); ++li) - { - if (!li->Target) - { + for (cmComputeLinkInformation::ItemVector::const_iterator li = deps.begin(); + li != deps.end(); ++li) { + if (!li->Target) { continue; - } + } - checkPropertyConsistency<bool>(this, li->Target, - strBool, - emittedBools, config, BoolType, 0); - if (cmSystemTools::GetErrorOccuredFlag()) - { + checkPropertyConsistency<bool>(this, li->Target, strBool, emittedBools, + config, BoolType, 0); + if (cmSystemTools::GetErrorOccuredFlag()) { return; - } - checkPropertyConsistency<const char *>(this, li->Target, - strString, - emittedStrings, config, - StringType, 0); - if (cmSystemTools::GetErrorOccuredFlag()) - { + } + checkPropertyConsistency<const char*>( + this, li->Target, strString, emittedStrings, config, StringType, 0); + if (cmSystemTools::GetErrorOccuredFlag()) { return; - } - checkPropertyConsistency<const char *>(this, li->Target, - strNumMin, - emittedMinNumbers, config, - NumberMinType, 0); - if (cmSystemTools::GetErrorOccuredFlag()) - { + } + checkPropertyConsistency<const char*>(this, li->Target, strNumMin, + emittedMinNumbers, config, + NumberMinType, 0); + if (cmSystemTools::GetErrorOccuredFlag()) { return; - } - checkPropertyConsistency<const char *>(this, li->Target, - strNumMax, - emittedMaxNumbers, config, - NumberMaxType, 0); - if (cmSystemTools::GetErrorOccuredFlag()) - { + } + checkPropertyConsistency<const char*>(this, li->Target, strNumMax, + emittedMaxNumbers, config, + NumberMaxType, 0); + if (cmSystemTools::GetErrorOccuredFlag()) { return; - } } + } - std::string prop = intersect(emittedBools, - emittedStrings, - emittedMinNumbers, + std::string prop = intersect(emittedBools, emittedStrings, emittedMinNumbers, emittedMaxNumbers); - if (!prop.empty()) - { + if (!prop.empty()) { // Use a sorted std::vector to keep the error message sorted. std::vector<std::string> props; std::set<std::string>::const_iterator i = emittedBools.find(prop); - if (i != emittedBools.end()) - { + if (i != emittedBools.end()) { props.push_back(strBool); - } + } i = emittedStrings.find(prop); - if (i != emittedStrings.end()) - { + if (i != emittedStrings.end()) { props.push_back(strString); - } + } i = emittedMinNumbers.find(prop); - if (i != emittedMinNumbers.end()) - { + if (i != emittedMinNumbers.end()) { props.push_back(strNumMin); - } + } i = emittedMaxNumbers.find(prop); - if (i != emittedMaxNumbers.end()) - { + if (i != emittedMaxNumbers.end()) { props.push_back(strNumMax); - } + } std::sort(props.begin(), props.end()); std::string propsString = cmJoin(cmMakeRange(props).retreat(1), ", "); propsString += " and the " + props.back(); std::ostringstream e; - e << "Property \"" << prop << "\" appears in both the " - << propsString << - " property in the dependencies of target \"" << this->GetName() << - "\". This is not allowed. A property may only require compatibility " - "in a boolean interpretation, a numeric minimum, a numeric maximum or a " - "string interpretation, but not a mixture."; + e << "Property \"" << prop << "\" appears in both the " << propsString + << " property in the dependencies of target \"" << this->GetName() + << "\". This is not allowed. A property may only require compatibility " + "in a boolean interpretation, a numeric minimum, a numeric maximum " + "or a " + "string interpretation, but not a mixture."; this->LocalGenerator->IssueMessage(cmake::FATAL_ERROR, e.str()); - } + } } std::string compatibilityType(CompatibleType t) { - switch(t) - { + switch (t) { case BoolType: return "Boolean compatibility"; case StringType: @@ -3992,204 +3447,183 @@ std::string compatibilityType(CompatibleType t) return "Numeric maximum compatibility"; case NumberMinType: return "Numeric minimum compatibility"; - } + } assert(0 && "Unreachable!"); return ""; } std::string compatibilityAgree(CompatibleType t, bool dominant) { - switch(t) - { + switch (t) { case BoolType: case StringType: return dominant ? "(Disagree)\n" : "(Agree)\n"; case NumberMaxType: case NumberMinType: return dominant ? "(Dominant)\n" : "(Ignored)\n"; - } + } assert(0 && "Unreachable!"); return ""; } -template<typename PropertyType> +template <typename PropertyType> PropertyType getTypedProperty(cmGeneratorTarget const* tgt, const std::string& prop); -template<> +template <> bool getTypedProperty<bool>(cmGeneratorTarget const* tgt, const std::string& prop) { return tgt->GetPropertyAsBool(prop); } -template<> -const char *getTypedProperty<const char *>(cmGeneratorTarget const* tgt, - const std::string& prop) +template <> +const char* getTypedProperty<const char*>(cmGeneratorTarget const* tgt, + const std::string& prop) { return tgt->GetProperty(prop); } -template<typename PropertyType> +template <typename PropertyType> std::string valueAsString(PropertyType); -template<> +template <> std::string valueAsString<bool>(bool value) { return value ? "TRUE" : "FALSE"; } -template<> +template <> std::string valueAsString<const char*>(const char* value) { return value ? value : "(unset)"; } -template<typename PropertyType> +template <typename PropertyType> PropertyType impliedValue(PropertyType); -template<> +template <> bool impliedValue<bool>(bool) { return false; } -template<> +template <> const char* impliedValue<const char*>(const char*) { return ""; } -template<typename PropertyType> +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) +template <> +std::pair<bool, bool> consistentProperty(bool lhs, bool rhs, CompatibleType) { return std::make_pair(lhs == rhs, lhs); } -std::pair<bool, const char*> consistentStringProperty(const char *lhs, - const char *rhs) +std::pair<bool, const char*> consistentStringProperty(const char* lhs, + const char* rhs) { const bool b = strcmp(lhs, rhs) == 0; return std::make_pair(b, b ? lhs : 0); } -std::pair<bool, const char*> consistentNumberProperty(const char *lhs, - const char *rhs, - CompatibleType t) +std::pair<bool, const char*> consistentNumberProperty(const char* lhs, + const char* rhs, + CompatibleType t) { - char *pEnd; + char* pEnd; const char* const null_ptr = 0; long lnum = strtol(lhs, &pEnd, 0); - if (pEnd == lhs || *pEnd != '\0' || errno == ERANGE) - { + if (pEnd == lhs || *pEnd != '\0' || errno == ERANGE) { return std::pair<bool, const char*>(false, null_ptr); - } + } long rnum = strtol(rhs, &pEnd, 0); - if (pEnd == rhs || *pEnd != '\0' || errno == ERANGE) - { + if (pEnd == rhs || *pEnd != '\0' || errno == ERANGE) { return std::pair<bool, const char*>(false, null_ptr); - } + } - if (t == NumberMaxType) - { + if (t == NumberMaxType) { return std::make_pair(true, std::max(lnum, rnum) == lnum ? lhs : rhs); - } - else - { + } else { return std::make_pair(true, std::min(lnum, rnum) == lnum ? lhs : rhs); - } + } } -template<> -std::pair<bool, const char*> consistentProperty(const char *lhs, - const char *rhs, +template <> +std::pair<bool, const char*> consistentProperty(const char* lhs, + const char* rhs, CompatibleType t) { - if (!lhs && !rhs) - { + if (!lhs && !rhs) { return std::make_pair(true, lhs); - } - if (!lhs) - { + } + if (!lhs) { return std::make_pair(true, rhs); - } - if (!rhs) - { + } + if (!rhs) { return std::make_pair(true, lhs); - } + } const char* const null_ptr = 0; - switch(t) - { - case BoolType: - assert(0 && "consistentProperty for strings called with BoolType"); - return std::pair<bool, const char*>(false, null_ptr); - case StringType: - return consistentStringProperty(lhs, rhs); - case NumberMinType: - case NumberMaxType: - return consistentNumberProperty(lhs, rhs, t); + switch (t) { + case BoolType: + assert(0 && "consistentProperty for strings called with BoolType"); + return std::pair<bool, const char*>(false, null_ptr); + case StringType: + return consistentStringProperty(lhs, rhs); + case NumberMinType: + case NumberMaxType: + return consistentNumberProperty(lhs, rhs, t); } assert(0 && "Unreachable!"); return std::pair<bool, const char*>(false, null_ptr); } -template<typename PropertyType> +template <typename PropertyType> PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt, - const std::string &p, - const std::string& config, - const char *defaultValue, - CompatibleType t, - PropertyType *) + const std::string& p, + const std::string& config, + const char* defaultValue, + CompatibleType t, + PropertyType*) { PropertyType propContent = getTypedProperty<PropertyType>(tgt, p); std::vector<std::string> headPropKeys = tgt->GetPropertyKeys(); const bool explicitlySet = - std::find(headPropKeys.begin(), headPropKeys.end(), - p) != headPropKeys.end(); + std::find(headPropKeys.begin(), headPropKeys.end(), p) != + headPropKeys.end(); - const bool impliedByUse = - tgt->IsNullImpliedByLinkLibraries(p); - assert((impliedByUse ^ explicitlySet) - || (!impliedByUse && !explicitlySet)); + const bool impliedByUse = tgt->IsNullImpliedByLinkLibraries(p); + assert((impliedByUse ^ explicitlySet) || (!impliedByUse && !explicitlySet)); std::vector<cmGeneratorTarget const*> const& deps = tgt->GetLinkImplementationClosure(config); - if(deps.empty()) - { + if (deps.empty()) { return propContent; - } + } bool propInitialized = explicitlySet; std::string report = " * Target \""; report += tgt->GetName(); - if (explicitlySet) - { + if (explicitlySet) { report += "\" has property content \""; report += valueAsString<PropertyType>(propContent); report += "\"\n"; - } - else if (impliedByUse) - { + } else if (impliedByUse) { report += "\" property is implied by use.\n"; - } - else - { + } else { report += "\" property not set.\n"; - } + } std::string interfaceProperty = "INTERFACE_" + p; - for(std::vector<cmGeneratorTarget const*>::const_iterator li = - deps.begin(); - li != deps.end(); ++li) - { + for (std::vector<cmGeneratorTarget const*>::const_iterator li = deps.begin(); + li != deps.end(); ++li) { // An error should be reported if one dependency // has INTERFACE_POSITION_INDEPENDENT_CODE ON and the other // has INTERFACE_POSITION_INDEPENDENT_CODE OFF, or if the @@ -4200,129 +3634,101 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt, std::vector<std::string> propKeys = theTarget->GetPropertyKeys(); - const bool ifaceIsSet = - std::find(propKeys.begin(), propKeys.end(), - interfaceProperty) != propKeys.end(); + const bool ifaceIsSet = std::find(propKeys.begin(), propKeys.end(), + interfaceProperty) != propKeys.end(); PropertyType ifacePropContent = - getTypedProperty<PropertyType>(theTarget, - interfaceProperty); + getTypedProperty<PropertyType>(theTarget, interfaceProperty); std::string reportEntry; - if (ifaceIsSet) - { + if (ifaceIsSet) { reportEntry += " * Target \""; reportEntry += theTarget->GetName(); reportEntry += "\" property value \""; reportEntry += valueAsString<PropertyType>(ifacePropContent); reportEntry += "\" "; - } + } - if (explicitlySet) - { - if (ifaceIsSet) - { + if (explicitlySet) { + if (ifaceIsSet) { std::pair<bool, PropertyType> consistent = - consistentProperty(propContent, - ifacePropContent, t); + consistentProperty(propContent, ifacePropContent, t); report += reportEntry; report += compatibilityAgree(t, propContent != consistent.second); - if (!consistent.first) - { + if (!consistent.first) { std::ostringstream e; - e << "Property " << p << " on target \"" - << tgt->GetName() << "\" does\nnot match the " - "INTERFACE_" << p << " property requirement\nof " - "dependency \"" << theTarget->GetName() << "\".\n"; + e << "Property " << p << " on target \"" << tgt->GetName() + << "\" does\nnot match the " + "INTERFACE_" + << p << " property requirement\nof " + "dependency \"" + << theTarget->GetName() << "\".\n"; cmSystemTools::Error(e.str().c_str()); break; - } - else - { + } else { propContent = consistent.second; continue; - } } - else - { + } else { // Explicitly set on target and not set in iface. Can't disagree. continue; - } } - else if (impliedByUse) - { + } else if (impliedByUse) { propContent = impliedValue<PropertyType>(propContent); - if (ifaceIsSet) - { + if (ifaceIsSet) { std::pair<bool, PropertyType> consistent = - consistentProperty(propContent, - ifacePropContent, t); + consistentProperty(propContent, ifacePropContent, t); report += reportEntry; report += compatibilityAgree(t, propContent != consistent.second); - if (!consistent.first) - { + if (!consistent.first) { std::ostringstream e; - e << "Property " << p << " on target \"" - << tgt->GetName() << "\" is\nimplied to be " << defaultValue + e << "Property " << p << " on target \"" << tgt->GetName() + << "\" is\nimplied to be " << defaultValue << " because it was used to determine the link libraries\n" - "already. The INTERFACE_" << p << " property on\ndependency \"" - << theTarget->GetName() << "\" is in conflict.\n"; + "already. The INTERFACE_" + << p << " property on\ndependency \"" << theTarget->GetName() + << "\" is in conflict.\n"; cmSystemTools::Error(e.str().c_str()); break; - } - else - { + } else { propContent = consistent.second; continue; - } } - else - { + } else { // Implicitly set on target and not set in iface. Can't disagree. continue; - } } - else - { - if (ifaceIsSet) - { - if (propInitialized) - { + } else { + if (ifaceIsSet) { + if (propInitialized) { std::pair<bool, PropertyType> consistent = - consistentProperty(propContent, - ifacePropContent, t); + consistentProperty(propContent, ifacePropContent, t); report += reportEntry; report += compatibilityAgree(t, propContent != consistent.second); - if (!consistent.first) - { + if (!consistent.first) { std::ostringstream e; e << "The INTERFACE_" << p << " property of \"" << theTarget->GetName() << "\" does\nnot agree with the value " - "of " << p << " already determined\nfor \"" - << tgt->GetName() << "\".\n"; + "of " + << p << " already determined\nfor \"" << tgt->GetName() + << "\".\n"; cmSystemTools::Error(e.str().c_str()); break; - } - else - { + } else { propContent = consistent.second; continue; - } } - else - { + } else { report += reportEntry + "(Interface set)\n"; propContent = ifacePropContent; propInitialized = true; - } } - else - { + } else { // Not set. Nothing to agree on. continue; - } } } + } tgt->ReportPropertyOrigin(p, valueAsString<PropertyType>(propContent), report, compatibilityType(t)); @@ -4330,73 +3736,56 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt, } bool cmGeneratorTarget::GetLinkInterfaceDependentBoolProperty( - const std::string &p, const std::string& config) const + const std::string& p, const std::string& config) const { - return checkInterfacePropertyCompatibility<bool>(this, p, config, - "FALSE", + return checkInterfacePropertyCompatibility<bool>(this, p, config, "FALSE", BoolType, 0); } const char* cmGeneratorTarget::GetLinkInterfaceDependentStringProperty( - const std::string &p, - const std::string& config) const + const std::string& p, const std::string& config) const { - return checkInterfacePropertyCompatibility<const char *>(this, - p, - config, - "empty", - StringType, 0); + return checkInterfacePropertyCompatibility<const char*>( + this, p, config, "empty", StringType, 0); } -const char * cmGeneratorTarget::GetLinkInterfaceDependentNumberMinProperty( - const std::string &p, - const std::string& config) const +const char* cmGeneratorTarget::GetLinkInterfaceDependentNumberMinProperty( + const std::string& p, const std::string& config) const { - return checkInterfacePropertyCompatibility<const char *>(this, - p, - config, - "empty", - NumberMinType, 0); + return checkInterfacePropertyCompatibility<const char*>( + this, p, config, "empty", NumberMinType, 0); } -const char * cmGeneratorTarget::GetLinkInterfaceDependentNumberMaxProperty( - const std::string &p, - const std::string& config) const +const char* cmGeneratorTarget::GetLinkInterfaceDependentNumberMaxProperty( + const std::string& p, const std::string& config) const { - return checkInterfacePropertyCompatibility<const char *>(this, - p, - config, - "empty", - NumberMaxType, 0); + return checkInterfacePropertyCompatibility<const char*>( + this, p, config, "empty", NumberMaxType, 0); } -cmComputeLinkInformation* -cmGeneratorTarget::GetLinkInformation(const std::string& config) const +cmComputeLinkInformation* cmGeneratorTarget::GetLinkInformation( + const std::string& config) const { // Lookup any existing information for this configuration. std::string key(cmSystemTools::UpperCase(config)); - cmTargetLinkInformationMap::iterator - i = this->LinkInformation.find(key); - if(i == this->LinkInformation.end()) - { + cmTargetLinkInformationMap::iterator i = this->LinkInformation.find(key); + if (i == this->LinkInformation.end()) { // Compute information for this configuration. cmComputeLinkInformation* info = new cmComputeLinkInformation(this, config); - if(!info || !info->Compute()) - { + if (!info || !info->Compute()) { delete info; info = 0; - } + } // Store the information for this configuration. cmTargetLinkInformationMap::value_type entry(key, info); i = this->LinkInformation.insert(entry).first; - if (info) - { + if (info) { this->CheckPropertyCompatibility(info, config); - } } + } return i->second; } @@ -4406,8 +3795,8 @@ void cmGeneratorTarget::GetTargetVersion(int& major, int& minor) const this->GetTargetVersion(false, major, minor, patch); } -void cmGeneratorTarget::GetTargetVersion(bool soversion, - int& major, int& minor, int& patch) const +void cmGeneratorTarget::GetTargetVersion(bool soversion, int& major, + int& minor, int& patch) const { // Set the default values. major = 0; @@ -4417,56 +3806,52 @@ void cmGeneratorTarget::GetTargetVersion(bool soversion, assert(this->GetType() != cmState::INTERFACE_LIBRARY); // Look for a VERSION or SOVERSION property. - const char* prop = soversion? "SOVERSION" : "VERSION"; - if(const char* version = this->GetProperty(prop)) - { + const char* prop = soversion ? "SOVERSION" : "VERSION"; + if (const char* version = this->GetProperty(prop)) { // Try to parse the version number and store the results that were // successfully parsed. int parsed_major; int parsed_minor; int parsed_patch; - switch(sscanf(version, "%d.%d.%d", - &parsed_major, &parsed_minor, &parsed_patch)) - { - case 3: patch = parsed_patch; // no break! - case 2: minor = parsed_minor; // no break! - case 1: major = parsed_major; // no break! - default: break; - } + switch (sscanf(version, "%d.%d.%d", &parsed_major, &parsed_minor, + &parsed_patch)) { + case 3: + patch = parsed_patch; // no break! + case 2: + minor = parsed_minor; // no break! + case 1: + major = parsed_major; // no break! + default: + break; } + } } std::string cmGeneratorTarget::GetFrameworkVersion() const { assert(this->GetType() != cmState::INTERFACE_LIBRARY); - if(const char* fversion = this->GetProperty("FRAMEWORK_VERSION")) - { + if (const char* fversion = this->GetProperty("FRAMEWORK_VERSION")) { return fversion; - } - else if(const char* tversion = this->GetProperty("VERSION")) - { + } else if (const char* tversion = this->GetProperty("VERSION")) { return tversion; - } - else - { + } else { return "A"; - } + } } void cmGeneratorTarget::ComputeVersionedName(std::string& vName, - std::string const& prefix, - std::string const& base, - std::string const& suffix, - std::string const& name, - const char* version) const -{ - vName = this->Makefile->IsOn("APPLE") ? (prefix+base) : name; - if(version) - { + std::string const& prefix, + std::string const& base, + std::string const& suffix, + std::string const& name, + const char* version) const +{ + vName = this->Makefile->IsOn("APPLE") ? (prefix + base) : name; + if (version) { vName += "."; vName += version; - } + } vName += this->Makefile->IsOn("APPLE") ? suffix : std::string(); } @@ -4476,41 +3861,33 @@ std::vector<std::string> cmGeneratorTarget::GetPropertyKeys() const std::vector<std::string> props; props.reserve(propsObject.size()); for (cmPropertyMap::const_iterator it = propsObject.begin(); - it != propsObject.end(); ++it) - { + it != propsObject.end(); ++it) { props.push_back(it->first); - } + } return props; } -void -cmGeneratorTarget::ReportPropertyOrigin(const std::string &p, - const std::string &result, - const std::string &report, - const std::string &compatibilityType) const +void cmGeneratorTarget::ReportPropertyOrigin( + const std::string& p, const std::string& result, const std::string& report, + const std::string& compatibilityType) const { std::vector<std::string> debugProperties; - const char *debugProp = this->Target->GetMakefile() - ->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES"); - if (debugProp) - { + const char* debugProp = this->Target->GetMakefile()->GetDefinition( + "CMAKE_DEBUG_TARGET_PROPERTIES"); + if (debugProp) { cmSystemTools::ExpandListArgument(debugProp, debugProperties); - } + } - bool debugOrigin = !this->DebugCompatiblePropertiesDone[p] - && std::find(debugProperties.begin(), - debugProperties.end(), - p) - != debugProperties.end(); + bool debugOrigin = !this->DebugCompatiblePropertiesDone[p] && + std::find(debugProperties.begin(), debugProperties.end(), p) != + debugProperties.end(); - if (this->GlobalGenerator->GetConfigureDoneCMP0026()) - { + if (this->GlobalGenerator->GetConfigureDoneCMP0026()) { this->DebugCompatiblePropertiesDone[p] = true; - } - if (!debugOrigin) - { + } + if (!debugOrigin) { return; - } + } std::string areport = compatibilityType; areport += std::string(" of property \"") + p + "\" for target \""; @@ -4523,293 +3900,240 @@ cmGeneratorTarget::ReportPropertyOrigin(const std::string &p, } void cmGeneratorTarget::LookupLinkItems(std::vector<std::string> const& names, - std::vector<cmLinkItem>& items) const + std::vector<cmLinkItem>& items) const { - for(std::vector<std::string>::const_iterator i = names.begin(); - i != names.end(); ++i) - { + for (std::vector<std::string>::const_iterator i = names.begin(); + i != names.end(); ++i) { std::string name = this->CheckCMP0004(*i); - if(name == this->GetName() || name.empty()) - { + if (name == this->GetName() || name.empty()) { continue; - } - items.push_back(cmLinkItem(name, this->FindTargetToLink(name))); } + items.push_back(cmLinkItem(name, this->FindTargetToLink(name))); + } } -void cmGeneratorTarget::ExpandLinkItems(std::string const& prop, - std::string const& value, - std::string const& config, - cmGeneratorTarget const* headTarget, - bool usage_requirements_only, - std::vector<cmLinkItem>& items, - bool& hadHeadSensitiveCondition) const +void cmGeneratorTarget::ExpandLinkItems( + std::string const& prop, std::string const& value, std::string const& config, + cmGeneratorTarget const* headTarget, bool usage_requirements_only, + std::vector<cmLinkItem>& items, bool& hadHeadSensitiveCondition) const { cmGeneratorExpression ge; cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), prop, 0, 0); // The $<LINK_ONLY> expression may be in a link interface to specify private // link dependencies that are otherwise excluded from usage requirements. - if(usage_requirements_only) - { + if (usage_requirements_only) { dagChecker.SetTransitivePropertiesOnly(); - } + } std::vector<std::string> libs; cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value); - cmSystemTools::ExpandListArgument(cge->Evaluate( - this->LocalGenerator, - config, - false, - headTarget, - this, &dagChecker), libs); + cmSystemTools::ExpandListArgument(cge->Evaluate(this->LocalGenerator, config, + false, headTarget, this, + &dagChecker), + libs); this->LookupLinkItems(libs, items); hadHeadSensitiveCondition = cge->GetHadHeadSensitiveCondition(); } -cmLinkInterface const* -cmGeneratorTarget::GetLinkInterface(const std::string& config, - cmGeneratorTarget const* head) const +cmLinkInterface const* cmGeneratorTarget::GetLinkInterface( + const std::string& config, cmGeneratorTarget const* head) const { // Imported targets have their own link interface. - if(this->IsImported()) - { + if (this->IsImported()) { return this->GetImportLinkInterface(config, head, false); - } + } // Link interfaces are not supported for executables that do not // export symbols. - if(this->GetType() == cmState::EXECUTABLE && - !this->IsExecutableWithExports()) - { + if (this->GetType() == cmState::EXECUTABLE && + !this->IsExecutableWithExports()) { return 0; - } + } // Lookup any existing link interface for this configuration. - cmHeadToLinkInterfaceMap& hm = - this->GetHeadToLinkInterfaceMap(config); + cmHeadToLinkInterfaceMap& hm = this->GetHeadToLinkInterfaceMap(config); // If the link interface does not depend on the head target // then return the one we computed first. - if(!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) - { + if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { return &hm.begin()->second; - } + } cmOptionalLinkInterface& iface = hm[head]; - if(!iface.LibrariesDone) - { + if (!iface.LibrariesDone) { iface.LibrariesDone = true; - this->ComputeLinkInterfaceLibraries( - config, iface, head, false); - } - if(!iface.AllDone) - { + this->ComputeLinkInterfaceLibraries(config, iface, head, false); + } + if (!iface.AllDone) { iface.AllDone = true; - if(iface.Exists) - { + if (iface.Exists) { this->ComputeLinkInterface(config, iface, head); - } } + } - return iface.Exists? &iface : 0; + return iface.Exists ? &iface : 0; } -void cmGeneratorTarget::ComputeLinkInterface(const std::string& config, - cmOptionalLinkInterface &iface, - cmGeneratorTarget const* headTarget) const +void cmGeneratorTarget::ComputeLinkInterface( + const std::string& config, cmOptionalLinkInterface& iface, + cmGeneratorTarget const* headTarget) const { - if(iface.ExplicitLibraries) - { - if(this->GetType() == cmState::SHARED_LIBRARY - || this->GetType() == cmState::STATIC_LIBRARY - || this->GetType() == cmState::INTERFACE_LIBRARY) - { + if (iface.ExplicitLibraries) { + if (this->GetType() == cmState::SHARED_LIBRARY || + this->GetType() == cmState::STATIC_LIBRARY || + this->GetType() == cmState::INTERFACE_LIBRARY) { // Shared libraries may have runtime implementation dependencies // on other shared libraries that are not in the interface. UNORDERED_SET<std::string> emitted; - for(std::vector<cmLinkItem>::const_iterator - li = iface.Libraries.begin(); li != iface.Libraries.end(); ++li) - { + for (std::vector<cmLinkItem>::const_iterator li = + iface.Libraries.begin(); + li != iface.Libraries.end(); ++li) { emitted.insert(*li); - } - if (this->GetType() != cmState::INTERFACE_LIBRARY) - { - cmLinkImplementation const* impl = - this->GetLinkImplementation(config); - for(std::vector<cmLinkImplItem>::const_iterator - li = impl->Libraries.begin(); li != impl->Libraries.end(); ++li) - { - if(emitted.insert(*li).second) - { - if(li->Target) - { + } + if (this->GetType() != cmState::INTERFACE_LIBRARY) { + cmLinkImplementation const* impl = this->GetLinkImplementation(config); + for (std::vector<cmLinkImplItem>::const_iterator li = + impl->Libraries.begin(); + li != impl->Libraries.end(); ++li) { + if (emitted.insert(*li).second) { + if (li->Target) { // This is a runtime dependency on another shared library. - if(li->Target->GetType() == cmState::SHARED_LIBRARY) - { + if (li->Target->GetType() == cmState::SHARED_LIBRARY) { iface.SharedDeps.push_back(*li); - } } - else - { + } else { // TODO: Recognize shared library file names. Perhaps this // should be moved to cmComputeLinkInformation, but that creates // a chicken-and-egg problem since this list is needed for its // construction. - } } } } } } - else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN - || this->GetPolicyStatusCMP0022() == cmPolicies::OLD) - { + } else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN || + this->GetPolicyStatusCMP0022() == cmPolicies::OLD) { // The link implementation is the default link interface. - cmLinkImplementationLibraries const* - impl = this->GetLinkImplementationLibrariesInternal(config, - headTarget); + cmLinkImplementationLibraries const* impl = + this->GetLinkImplementationLibrariesInternal(config, headTarget); iface.ImplementationIsInterface = true; iface.WrongConfigLibraries = impl->WrongConfigLibraries; - } + } - if(this->LinkLanguagePropagatesToDependents()) - { + if (this->LinkLanguagePropagatesToDependents()) { // Targets using this archive need its language runtime libraries. - if(cmLinkImplementation const* impl = - this->GetLinkImplementation(config)) - { + if (cmLinkImplementation const* impl = + this->GetLinkImplementation(config)) { iface.Languages = impl->Languages; - } } + } - if(this->GetType() == cmState::STATIC_LIBRARY) - { + if (this->GetType() == cmState::STATIC_LIBRARY) { // Construct the property name suffix for this configuration. std::string suffix = "_"; - if(!config.empty()) - { + if (!config.empty()) { suffix += cmSystemTools::UpperCase(config); - } - else - { + } else { suffix += "NOCONFIG"; - } + } // How many repetitions are needed if this library has cyclic // dependencies? std::string propName = "LINK_INTERFACE_MULTIPLICITY"; propName += suffix; - if(const char* config_reps = this->GetProperty(propName)) - { + if (const char* config_reps = this->GetProperty(propName)) { sscanf(config_reps, "%u", &iface.Multiplicity); - } - else if(const char* reps = - this->GetProperty("LINK_INTERFACE_MULTIPLICITY")) - { + } else if (const char* reps = + this->GetProperty("LINK_INTERFACE_MULTIPLICITY")) { sscanf(reps, "%u", &iface.Multiplicity); - } } + } } -const cmLinkInterfaceLibraries * -cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config, - cmGeneratorTarget const* head, - bool usage_requirements_only) const +const cmLinkInterfaceLibraries* cmGeneratorTarget::GetLinkInterfaceLibraries( + const std::string& config, cmGeneratorTarget const* head, + bool usage_requirements_only) const { // Imported targets have their own link interface. - if(this->IsImported()) - { - return this->GetImportLinkInterface(config, head, - usage_requirements_only); - } + if (this->IsImported()) { + return this->GetImportLinkInterface(config, head, usage_requirements_only); + } // Link interfaces are not supported for executables that do not // export symbols. - if(this->GetType() == cmState::EXECUTABLE && - !this->IsExecutableWithExports()) - { + if (this->GetType() == cmState::EXECUTABLE && + !this->IsExecutableWithExports()) { return 0; - } + } // Lookup any existing link interface for this configuration. std::string CONFIG = cmSystemTools::UpperCase(config); cmHeadToLinkInterfaceMap& hm = - (usage_requirements_only ? - this->GetHeadToLinkInterfaceUsageRequirementsMap(config) : - this->GetHeadToLinkInterfaceMap(config)); + (usage_requirements_only + ? this->GetHeadToLinkInterfaceUsageRequirementsMap(config) + : this->GetHeadToLinkInterfaceMap(config)); // If the link interface does not depend on the head target // then return the one we computed first. - if(!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) - { + if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { return &hm.begin()->second; - } + } cmOptionalLinkInterface& iface = hm[head]; - if(!iface.LibrariesDone) - { + if (!iface.LibrariesDone) { iface.LibrariesDone = true; - this->ComputeLinkInterfaceLibraries( - config, iface, head, usage_requirements_only); - } + this->ComputeLinkInterfaceLibraries(config, iface, head, + usage_requirements_only); + } - return iface.Exists? &iface : 0; + return iface.Exists ? &iface : 0; } std::string cmGeneratorTarget::GetDirectory(const std::string& config, - bool implib) const + bool implib) const { - if (this->IsImported()) - { + if (this->IsImported()) { // Return the directory from which the target is imported. - return - cmSystemTools::GetFilenamePath( + return cmSystemTools::GetFilenamePath( this->Target->ImportedGetFullPath(config, implib)); - } - else if(OutputInfo const* info = this->GetOutputInfo(config)) - { + } else if (OutputInfo const* info = this->GetOutputInfo(config)) { // Return the directory in which the target will be built. - return implib? info->ImpDir : info->OutDir; - } + return implib ? info->ImpDir : info->OutDir; + } return ""; } bool cmGeneratorTarget::UsesDefaultOutputDir(const std::string& config, - bool implib) const + bool implib) const { std::string dir; return this->ComputeOutputDir(config, implib, dir); } cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo( - const std::string& config) const + const std::string& config) const { // There is no output information for imported targets. - if(this->IsImported()) - { + if (this->IsImported()) { return 0; - } + } // Only libraries and executables have well-defined output files. - if(!this->HaveWellDefinedOutputFiles()) - { + if (!this->HaveWellDefinedOutputFiles()) { std::string msg = "cmGeneratorTarget::GetOutputInfo called for "; msg += this->GetName(); msg += " which has type "; msg += cmState::GetTargetTypeName(this->GetType()); this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg); return 0; - } + } // Lookup/compute/cache the output information for this configuration. std::string config_upper; - if(!config.empty()) - { + if (!config.empty()) { config_upper = cmSystemTools::UpperCase(config); - } - OutputInfoMapType::iterator i = - this->OutputInfoMap.find(config_upper); - if(i == this->OutputInfoMap.end()) - { + } + OutputInfoMapType::iterator i = this->OutputInfoMap.find(config_upper); + if (i == this->OutputInfoMap.end()) { // Add empty info in map to detect potential recursion. OutputInfo info; OutputInfoMapType::value_type entry(config_upper, info); @@ -4818,16 +4142,13 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo( // Compute output directories. this->ComputeOutputDir(config, false, info.OutDir); this->ComputeOutputDir(config, true, info.ImpDir); - if(!this->ComputePDBOutputDir("PDB", config, info.PdbDir)) - { + if (!this->ComputePDBOutputDir("PDB", config, info.PdbDir)) { info.PdbDir = info.OutDir; - } + } // Now update the previously-prepared map entry. i->second = info; - } - else if(i->second.empty()) - { + } else if (i->second.empty()) { // An empty map entry indicates we have been called recursively // from the above block. this->LocalGenerator->GetCMakeInstance()->IssueMessage( @@ -4835,12 +4156,12 @@ cmGeneratorTarget::OutputInfo const* cmGeneratorTarget::GetOutputInfo( "Target '" + this->GetName() + "' OUTPUT_DIRECTORY depends on itself.", this->GetBacktrace()); return 0; - } + } return &i->second; } bool cmGeneratorTarget::ComputeOutputDir(const std::string& config, - bool implib, std::string& out) const + bool implib, std::string& out) const { bool usesDefaultOutputDir = false; std::string conf = config; @@ -4850,26 +4171,23 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config, std::string targetTypeName = this->GetOutputTargetType(implib); const char* propertyName = 0; std::string propertyNameStr = targetTypeName; - if(!propertyNameStr.empty()) - { + if (!propertyNameStr.empty()) { propertyNameStr += "_OUTPUT_DIRECTORY"; propertyName = propertyNameStr.c_str(); - } + } // Check for a per-configuration output directory target property. std::string configUpper = cmSystemTools::UpperCase(conf); const char* configProp = 0; std::string configPropStr = targetTypeName; - if(!configPropStr.empty()) - { + if (!configPropStr.empty()) { configPropStr += "_OUTPUT_DIRECTORY_"; configPropStr += configUpper; configProp = configPropStr.c_str(); - } + } // Select an output directory. - if(const char* config_outdir = this->GetProperty(configProp)) - { + if (const char* config_outdir = this->GetProperty(configProp)) { // Use the user-specified per-configuration output directory. cmGeneratorExpression ge; cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = @@ -4878,117 +4196,100 @@ bool cmGeneratorTarget::ComputeOutputDir(const std::string& config, // Skip per-configuration subdirectory. conf = ""; - } - else if(const char* outdir = this->GetProperty(propertyName)) - { + } else if (const char* outdir = this->GetProperty(propertyName)) { // Use the user-specified output directory. cmGeneratorExpression ge; - cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = - ge.Parse(outdir); + cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(outdir); out = cge->Evaluate(this->LocalGenerator, config); // Skip per-configuration subdirectory if the value contained a // generator expression. - if (out != outdir) - { + if (out != outdir) { conf = ""; - } } - else if(this->GetType() == cmState::EXECUTABLE) - { + } else if (this->GetType() == cmState::EXECUTABLE) { // Lookup the output path for executables. out = this->Makefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"); - } - else if(this->GetType() == cmState::STATIC_LIBRARY || - this->GetType() == cmState::SHARED_LIBRARY || - this->GetType() == cmState::MODULE_LIBRARY) - { + } else if (this->GetType() == cmState::STATIC_LIBRARY || + this->GetType() == cmState::SHARED_LIBRARY || + this->GetType() == cmState::MODULE_LIBRARY) { // Lookup the output path for libraries. out = this->Makefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH"); - } - if(out.empty()) - { + } + if (out.empty()) { // Default to the current output directory. usesDefaultOutputDir = true; out = "."; - } + } // Convert the output path to a full path in case it is // specified as a relative path. Treat a relative path as // relative to the current output directory for this makefile. - out = (cmSystemTools::CollapseFullPath - (out, this->LocalGenerator->GetCurrentBinaryDirectory())); + out = (cmSystemTools::CollapseFullPath( + out, this->LocalGenerator->GetCurrentBinaryDirectory())); // The generator may add the configuration's subdirectory. - if(!conf.empty()) - { + if (!conf.empty()) { bool iosPlatform = this->Makefile->PlatformIsAppleIos(); std::string suffix = usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : ""; - this->LocalGenerator->GetGlobalGenerator()-> - AppendDirectoryForConfig("/", conf, suffix, out); - } + this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig( + "/", conf, suffix, out); + } return usesDefaultOutputDir; } bool cmGeneratorTarget::ComputePDBOutputDir(const std::string& kind, - const std::string& config, - std::string& out) const + const std::string& config, + std::string& out) const { // Look for a target property defining the target output directory // based on the target type. const char* propertyName = 0; std::string propertyNameStr = kind; - if(!propertyNameStr.empty()) - { + if (!propertyNameStr.empty()) { propertyNameStr += "_OUTPUT_DIRECTORY"; propertyName = propertyNameStr.c_str(); - } + } std::string conf = config; // Check for a per-configuration output directory target property. std::string configUpper = cmSystemTools::UpperCase(conf); const char* configProp = 0; std::string configPropStr = kind; - if(!configPropStr.empty()) - { + if (!configPropStr.empty()) { configPropStr += "_OUTPUT_DIRECTORY_"; configPropStr += configUpper; configProp = configPropStr.c_str(); - } + } // Select an output directory. - if(const char* config_outdir = this->GetProperty(configProp)) - { + if (const char* config_outdir = this->GetProperty(configProp)) { // Use the user-specified per-configuration output directory. out = config_outdir; // Skip per-configuration subdirectory. conf = ""; - } - else if(const char* outdir = this->GetProperty(propertyName)) - { + } else if (const char* outdir = this->GetProperty(propertyName)) { // Use the user-specified output directory. out = outdir; - } - if(out.empty()) - { + } + if (out.empty()) { return false; - } + } // Convert the output path to a full path in case it is // specified as a relative path. Treat a relative path as // relative to the current output directory for this makefile. - out = (cmSystemTools::CollapseFullPath - (out, this->LocalGenerator->GetCurrentBinaryDirectory())); + out = (cmSystemTools::CollapseFullPath( + out, this->LocalGenerator->GetCurrentBinaryDirectory())); // The generator may add the configuration's subdirectory. - if(!conf.empty()) - { - this->LocalGenerator->GetGlobalGenerator()-> - AppendDirectoryForConfig("/", conf, "", out); - } + if (!conf.empty()) { + this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig( + "/", conf, "", out); + } return true; } @@ -4996,41 +4297,32 @@ bool cmGeneratorTarget::HaveInstallTreeRPATH() const { const char* install_rpath = this->GetProperty("INSTALL_RPATH"); return (install_rpath && *install_rpath) && - !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH"); + !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH"); } -void -cmGeneratorTarget::ComputeLinkInterfaceLibraries( - const std::string& config, - cmOptionalLinkInterface& iface, - cmGeneratorTarget const* headTarget, - bool usage_requirements_only) const +void cmGeneratorTarget::ComputeLinkInterfaceLibraries( + const std::string& config, cmOptionalLinkInterface& iface, + cmGeneratorTarget const* headTarget, bool usage_requirements_only) const { // Construct the property name suffix for this configuration. std::string suffix = "_"; - if(!config.empty()) - { + if (!config.empty()) { suffix += cmSystemTools::UpperCase(config); - } - else - { + } else { suffix += "NOCONFIG"; - } + } // An explicit list of interface libraries may be set for shared // libraries and executables that export symbols. const char* explicitLibraries = 0; std::string linkIfaceProp; - if(this->GetPolicyStatusCMP0022() != cmPolicies::OLD && - this->GetPolicyStatusCMP0022() != cmPolicies::WARN) - { + if (this->GetPolicyStatusCMP0022() != cmPolicies::OLD && + this->GetPolicyStatusCMP0022() != cmPolicies::WARN) { // CMP0022 NEW behavior is to use INTERFACE_LINK_LIBRARIES. linkIfaceProp = "INTERFACE_LINK_LIBRARIES"; explicitLibraries = this->GetProperty(linkIfaceProp); - } - else if(this->GetType() == cmState::SHARED_LIBRARY || - this->IsExecutableWithExports()) - { + } else if (this->GetType() == cmState::SHARED_LIBRARY || + this->IsExecutableWithExports()) { // CMP0022 OLD behavior is to use LINK_INTERFACE_LIBRARIES if set on a // shared lib or executable. @@ -5040,24 +4332,21 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( explicitLibraries = this->GetProperty(linkIfaceProp); // If not set, try the generic property. - if(!explicitLibraries) - { + if (!explicitLibraries) { linkIfaceProp = "LINK_INTERFACE_LIBRARIES"; explicitLibraries = this->GetProperty(linkIfaceProp); - } } + } - if(explicitLibraries && - this->GetPolicyStatusCMP0022() == cmPolicies::WARN && - !this->PolicyWarnedCMP0022) - { + if (explicitLibraries && + this->GetPolicyStatusCMP0022() == cmPolicies::WARN && + !this->PolicyWarnedCMP0022) { // Compare the explicitly set old link interface properties to the // preferred new link interface property one and warn if different. const char* newExplicitLibraries = this->GetProperty("INTERFACE_LINK_LIBRARIES"); - if (newExplicitLibraries - && strcmp(newExplicitLibraries, explicitLibraries) != 0) - { + if (newExplicitLibraries && + strcmp(newExplicitLibraries, explicitLibraries) != 0) { std::ostringstream w; /* clang-format off */ w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0022) << "\n" @@ -5072,64 +4361,56 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( /* clang-format on */ this->LocalGenerator->IssueMessage(cmake::AUTHOR_WARNING, w.str()); this->PolicyWarnedCMP0022 = true; - } } + } // There is no implicit link interface for executables or modules // so if none was explicitly set then there is no link interface. - if(!explicitLibraries && - (this->GetType() == cmState::EXECUTABLE || - (this->GetType() == cmState::MODULE_LIBRARY))) - { + if (!explicitLibraries && (this->GetType() == cmState::EXECUTABLE || + (this->GetType() == cmState::MODULE_LIBRARY))) { return; - } + } iface.Exists = true; iface.ExplicitLibraries = explicitLibraries; - if(explicitLibraries) - { + if (explicitLibraries) { // The interface libraries have been explicitly set. - this->ExpandLinkItems(linkIfaceProp, explicitLibraries, - config, - headTarget, usage_requirements_only, - iface.Libraries, - iface.HadHeadSensitiveCondition); - } - else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN - || this->GetPolicyStatusCMP0022() == cmPolicies::OLD) - // If CMP0022 is NEW then the plain tll signature sets the - // INTERFACE_LINK_LIBRARIES, so if we get here then the project - // cleared the property explicitly and we should not fall back - // to the link implementation. - { + this->ExpandLinkItems(linkIfaceProp, explicitLibraries, config, headTarget, + usage_requirements_only, iface.Libraries, + iface.HadHeadSensitiveCondition); + } else if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN || + this->GetPolicyStatusCMP0022() == cmPolicies::OLD) + // If CMP0022 is NEW then the plain tll signature sets the + // INTERFACE_LINK_LIBRARIES, so if we get here then the project + // cleared the property explicitly and we should not fall back + // to the link implementation. + { // The link implementation is the default link interface. cmLinkImplementationLibraries const* impl = this->GetLinkImplementationLibrariesInternal(config, headTarget); - iface.Libraries.insert(iface.Libraries.end(), - impl->Libraries.begin(), impl->Libraries.end()); - if(this->GetPolicyStatusCMP0022() == cmPolicies::WARN && - !this->PolicyWarnedCMP0022 && !usage_requirements_only) - { + iface.Libraries.insert(iface.Libraries.end(), impl->Libraries.begin(), + impl->Libraries.end()); + if (this->GetPolicyStatusCMP0022() == cmPolicies::WARN && + !this->PolicyWarnedCMP0022 && !usage_requirements_only) { // Compare the link implementation fallback link interface to the // preferred new link interface property and warn if different. std::vector<cmLinkItem> ifaceLibs; static const std::string newProp = "INTERFACE_LINK_LIBRARIES"; - if(const char* newExplicitLibraries = this->GetProperty(newProp)) - { + if (const char* newExplicitLibraries = this->GetProperty(newProp)) { bool hadHeadSensitiveConditionDummy = false; this->ExpandLinkItems(newProp, newExplicitLibraries, config, - headTarget, - usage_requirements_only, - ifaceLibs, hadHeadSensitiveConditionDummy); - } - if (ifaceLibs != iface.Libraries) - { + headTarget, usage_requirements_only, ifaceLibs, + hadHeadSensitiveConditionDummy); + } + if (ifaceLibs != iface.Libraries) { std::string oldLibraries = cmJoin(impl->Libraries, ";"); std::string newLibraries = cmJoin(ifaceLibs, ";"); - if(oldLibraries.empty()) - { oldLibraries = "(empty)"; } - if(newLibraries.empty()) - { newLibraries = "(empty)"; } + if (oldLibraries.empty()) { + oldLibraries = "(empty)"; + } + if (newLibraries.empty()) { + newLibraries = "(empty)"; + } std::ostringstream w; /* clang-format off */ @@ -5148,102 +4429,88 @@ cmGeneratorTarget::ComputeLinkInterfaceLibraries( /* clang-format on */ this->LocalGenerator->IssueMessage(cmake::AUTHOR_WARNING, w.str()); this->PolicyWarnedCMP0022 = true; - } } } + } } -const cmLinkInterface * -cmGeneratorTarget::GetImportLinkInterface(const std::string& config, - cmGeneratorTarget const* headTarget, - bool usage_requirements_only) const +const cmLinkInterface* cmGeneratorTarget::GetImportLinkInterface( + const std::string& config, cmGeneratorTarget const* headTarget, + bool usage_requirements_only) const { cmGeneratorTarget::ImportInfo const* info = this->GetImportInfo(config); - if(!info) - { + if (!info) { return 0; - } + } std::string CONFIG = cmSystemTools::UpperCase(config); cmHeadToLinkInterfaceMap& hm = - (usage_requirements_only ? - this->GetHeadToLinkInterfaceUsageRequirementsMap(config) : - this->GetHeadToLinkInterfaceMap(config)); + (usage_requirements_only + ? this->GetHeadToLinkInterfaceUsageRequirementsMap(config) + : this->GetHeadToLinkInterfaceMap(config)); // If the link interface does not depend on the head target // then return the one we computed first. - if(!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) - { + if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { return &hm.begin()->second; - } + } cmOptionalLinkInterface& iface = hm[headTarget]; - if(!iface.AllDone) - { + if (!iface.AllDone) { iface.AllDone = true; iface.Multiplicity = info->Multiplicity; cmSystemTools::ExpandListArgument(info->Languages, iface.Languages); - this->ExpandLinkItems(info->LibrariesProp, info->Libraries, - config, - headTarget, usage_requirements_only, - iface.Libraries, + this->ExpandLinkItems(info->LibrariesProp, info->Libraries, config, + headTarget, usage_requirements_only, iface.Libraries, iface.HadHeadSensitiveCondition); std::vector<std::string> deps; cmSystemTools::ExpandListArgument(info->SharedDeps, deps); this->LookupLinkItems(deps, iface.SharedDeps); - } + } return &iface; } -cmGeneratorTarget::ImportInfo const* -cmGeneratorTarget::GetImportInfo(const std::string& config) const +cmGeneratorTarget::ImportInfo const* cmGeneratorTarget::GetImportInfo( + const std::string& config) const { // There is no imported information for non-imported targets. - if(!this->IsImported()) - { + if (!this->IsImported()) { return 0; - } + } // Lookup/compute/cache the import information for this // configuration. std::string config_upper; - if(!config.empty()) - { + if (!config.empty()) { config_upper = cmSystemTools::UpperCase(config); - } - else - { + } else { config_upper = "NOCONFIG"; - } + } - ImportInfoMapType::const_iterator i = - this->ImportInfoMap.find(config_upper); - if(i == this->ImportInfoMap.end()) - { + ImportInfoMapType::const_iterator i = this->ImportInfoMap.find(config_upper); + if (i == this->ImportInfoMap.end()) { ImportInfo info; this->ComputeImportInfo(config_upper, info); ImportInfoMapType::value_type entry(config_upper, info); i = this->ImportInfoMap.insert(entry).first; - } + } - if(this->GetType() == cmState::INTERFACE_LIBRARY) - { + if (this->GetType() == cmState::INTERFACE_LIBRARY) { return &i->second; - } + } // If the location is empty then the target is not available for // this configuration. - if(i->second.Location.empty() && i->second.ImportLibrary.empty()) - { + if (i->second.Location.empty() && i->second.ImportLibrary.empty()) { return 0; - } + } // Return the import information. return &i->second; } void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config, - ImportInfo& info) const + ImportInfo& info) const { // This method finds information about an imported target from its // properties. The "IMPORTED_" namespace is reserved for properties @@ -5255,164 +4522,128 @@ void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config, const char* loc = 0; const char* imp = 0; std::string suffix; - if (!this->Target->GetMappedConfig(desired_config, &loc, &imp, suffix)) - { + if (!this->Target->GetMappedConfig(desired_config, &loc, &imp, suffix)) { return; - } + } // Get the link interface. { - std::string linkProp = "INTERFACE_LINK_LIBRARIES"; - const char *propertyLibs = this->GetProperty(linkProp); - - if (this->GetType() != cmState::INTERFACE_LIBRARY) - { - if(!propertyLibs) - { - linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES"; - linkProp += suffix; - propertyLibs = this->GetProperty(linkProp); + std::string linkProp = "INTERFACE_LINK_LIBRARIES"; + const char* propertyLibs = this->GetProperty(linkProp); + + if (this->GetType() != cmState::INTERFACE_LIBRARY) { + if (!propertyLibs) { + linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES"; + linkProp += suffix; + propertyLibs = this->GetProperty(linkProp); } - if(!propertyLibs) - { - linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES"; - propertyLibs = this->GetProperty(linkProp); + if (!propertyLibs) { + linkProp = "IMPORTED_LINK_INTERFACE_LIBRARIES"; + propertyLibs = this->GetProperty(linkProp); } } - if(propertyLibs) - { - info.LibrariesProp = linkProp; - info.Libraries = propertyLibs; + if (propertyLibs) { + info.LibrariesProp = linkProp; + info.Libraries = propertyLibs; } } - if(this->GetType() == cmState::INTERFACE_LIBRARY) - { + if (this->GetType() == cmState::INTERFACE_LIBRARY) { return; - } + } // A provided configuration has been chosen. Load the // configuration's properties. // Get the location. - if(loc) - { + if (loc) { info.Location = loc; - } - else - { + } else { std::string impProp = "IMPORTED_LOCATION"; impProp += suffix; - if(const char* config_location = this->GetProperty(impProp)) - { + if (const char* config_location = this->GetProperty(impProp)) { info.Location = config_location; - } - else if(const char* location = this->GetProperty("IMPORTED_LOCATION")) - { + } else if (const char* location = this->GetProperty("IMPORTED_LOCATION")) { info.Location = location; - } } + } // Get the soname. - if(this->GetType() == cmState::SHARED_LIBRARY) - { + if (this->GetType() == cmState::SHARED_LIBRARY) { std::string soProp = "IMPORTED_SONAME"; soProp += suffix; - if(const char* config_soname = this->GetProperty(soProp)) - { + if (const char* config_soname = this->GetProperty(soProp)) { info.SOName = config_soname; - } - else if(const char* soname = this->GetProperty("IMPORTED_SONAME")) - { + } else if (const char* soname = this->GetProperty("IMPORTED_SONAME")) { info.SOName = soname; - } } + } // Get the "no-soname" mark. - if(this->GetType() == cmState::SHARED_LIBRARY) - { + if (this->GetType() == cmState::SHARED_LIBRARY) { std::string soProp = "IMPORTED_NO_SONAME"; soProp += suffix; - if(const char* config_no_soname = this->GetProperty(soProp)) - { + if (const char* config_no_soname = this->GetProperty(soProp)) { info.NoSOName = cmSystemTools::IsOn(config_no_soname); - } - else if(const char* no_soname = this->GetProperty("IMPORTED_NO_SONAME")) - { + } else if (const char* no_soname = + this->GetProperty("IMPORTED_NO_SONAME")) { info.NoSOName = cmSystemTools::IsOn(no_soname); - } } + } // Get the import library. - if(imp) - { + if (imp) { info.ImportLibrary = imp; - } - else if(this->GetType() == cmState::SHARED_LIBRARY || - this->IsExecutableWithExports()) - { + } else if (this->GetType() == cmState::SHARED_LIBRARY || + this->IsExecutableWithExports()) { std::string impProp = "IMPORTED_IMPLIB"; impProp += suffix; - if(const char* config_implib = this->GetProperty(impProp)) - { + if (const char* config_implib = this->GetProperty(impProp)) { info.ImportLibrary = config_implib; - } - else if(const char* implib = this->GetProperty("IMPORTED_IMPLIB")) - { + } else if (const char* implib = this->GetProperty("IMPORTED_IMPLIB")) { info.ImportLibrary = implib; - } } + } // Get the link dependencies. { - std::string linkProp = "IMPORTED_LINK_DEPENDENT_LIBRARIES"; - linkProp += suffix; - if(const char* config_libs = this->GetProperty(linkProp)) - { - info.SharedDeps = config_libs; - } - else if(const char* libs = - this->GetProperty("IMPORTED_LINK_DEPENDENT_LIBRARIES")) - { - info.SharedDeps = libs; + std::string linkProp = "IMPORTED_LINK_DEPENDENT_LIBRARIES"; + linkProp += suffix; + if (const char* config_libs = this->GetProperty(linkProp)) { + info.SharedDeps = config_libs; + } else if (const char* libs = + this->GetProperty("IMPORTED_LINK_DEPENDENT_LIBRARIES")) { + info.SharedDeps = libs; } } // Get the link languages. - if(this->LinkLanguagePropagatesToDependents()) - { + if (this->LinkLanguagePropagatesToDependents()) { std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES"; linkProp += suffix; - if(const char* config_libs = this->GetProperty(linkProp)) - { + if (const char* config_libs = this->GetProperty(linkProp)) { info.Languages = config_libs; - } - else if(const char* libs = - this->GetProperty("IMPORTED_LINK_INTERFACE_LANGUAGES")) - { + } else if (const char* libs = + this->GetProperty("IMPORTED_LINK_INTERFACE_LANGUAGES")) { info.Languages = libs; - } } + } // Get the cyclic repetition count. - if(this->GetType() == cmState::STATIC_LIBRARY) - { + if (this->GetType() == cmState::STATIC_LIBRARY) { std::string linkProp = "IMPORTED_LINK_INTERFACE_MULTIPLICITY"; linkProp += suffix; - if(const char* config_reps = this->GetProperty(linkProp)) - { + if (const char* config_reps = this->GetProperty(linkProp)) { sscanf(config_reps, "%u", &info.Multiplicity); - } - else if(const char* reps = - this->GetProperty("IMPORTED_LINK_INTERFACE_MULTIPLICITY")) - { + } else if (const char* reps = + this->GetProperty("IMPORTED_LINK_INTERFACE_MULTIPLICITY")) { sscanf(reps, "%u", &info.Multiplicity); - } } + } } -cmHeadToLinkInterfaceMap& -cmGeneratorTarget::GetHeadToLinkInterfaceMap(const std::string &config) const +cmHeadToLinkInterfaceMap& cmGeneratorTarget::GetHeadToLinkInterfaceMap( + const std::string& config) const { std::string CONFIG = cmSystemTools::UpperCase(config); return this->LinkInterfaceMap[CONFIG]; @@ -5420,75 +4651,67 @@ cmGeneratorTarget::GetHeadToLinkInterfaceMap(const std::string &config) const cmHeadToLinkInterfaceMap& cmGeneratorTarget::GetHeadToLinkInterfaceUsageRequirementsMap( - const std::string &config) const + const std::string& config) const { std::string CONFIG = cmSystemTools::UpperCase(config); return this->LinkInterfaceUsageRequirementsOnlyMap[CONFIG]; } -const cmLinkImplementation * -cmGeneratorTarget::GetLinkImplementation(const std::string& config) const +const cmLinkImplementation* cmGeneratorTarget::GetLinkImplementation( + const std::string& config) const { // There is no link implementation for imported targets. - if(this->IsImported()) - { + if (this->IsImported()) { return 0; - } + } std::string CONFIG = cmSystemTools::UpperCase(config); cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this]; - if(!impl.LibrariesDone) - { + if (!impl.LibrariesDone) { impl.LibrariesDone = true; this->ComputeLinkImplementationLibraries(config, impl, this); - } - if(!impl.LanguagesDone) - { + } + if (!impl.LanguagesDone) { impl.LanguagesDone = true; this->ComputeLinkImplementationLanguages(config, impl); - } + } return &impl; } bool cmGeneratorTarget::GetConfigCommonSourceFiles( - std::vector<cmSourceFile*>& files) const + std::vector<cmSourceFile*>& files) const { std::vector<std::string> configs; this->Makefile->GetConfigurations(configs); - if (configs.empty()) - { + if (configs.empty()) { configs.push_back(""); - } + } std::vector<std::string>::const_iterator it = configs.begin(); const std::string& firstConfig = *it; this->GetSourceFiles(files, firstConfig); - for ( ; it != configs.end(); ++it) - { + for (; it != configs.end(); ++it) { std::vector<cmSourceFile*> configFiles; this->GetSourceFiles(configFiles, *it); - if (configFiles != files) - { + if (configFiles != files) { std::string firstConfigFiles; const char* sep = ""; for (std::vector<cmSourceFile*>::const_iterator fi = files.begin(); - fi != files.end(); ++fi) - { + fi != files.end(); ++fi) { firstConfigFiles += sep; firstConfigFiles += (*fi)->GetFullPath(); sep = "\n "; - } + } std::string thisConfigFiles; sep = ""; for (std::vector<cmSourceFile*>::const_iterator fi = configFiles.begin(); - fi != configFiles.end(); ++fi) - { + fi != configFiles.end(); ++fi) { thisConfigFiles += sep; thisConfigFiles += (*fi)->GetFullPath(); sep = "\n "; - } + } std::ostringstream e; /* clang-format off */ e << "Target \"" << this->GetName() @@ -5503,13 +4726,13 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles( /* clang-format on */ this->LocalGenerator->IssueMessage(cmake::FATAL_ERROR, e.str()); return false; - } } + } return true; } void cmGeneratorTarget::GetObjectLibrariesCMP0026( - std::vector<cmGeneratorTarget*>& objlibs) const + std::vector<cmGeneratorTarget*>& objlibs) const { // At configure-time, this method can be called as part of getting the // LOCATION property or to export() a file to be include()d. However @@ -5517,34 +4740,29 @@ void cmGeneratorTarget::GetObjectLibrariesCMP0026( // for TARGET_OBJECTS instead for backwards compatibility with OLD // behavior of CMP0024 and CMP0026 only. cmStringRange rng = this->Target->GetSourceEntries(); - for(std::vector<std::string>::const_iterator - i = rng.begin(); i != rng.end(); ++i) - { + for (std::vector<std::string>::const_iterator i = rng.begin(); + i != rng.end(); ++i) { std::string const& entry = *i; std::vector<std::string> files; cmSystemTools::ExpandListArgument(entry, files); - for (std::vector<std::string>::const_iterator - li = files.begin(); li != files.end(); ++li) - { - if(cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") && - (*li)[li->size() - 1] == '>') - { - std::string objLibName = li->substr(17, li->size()-18); - - if (cmGeneratorExpression::Find(objLibName) != std::string::npos) - { + for (std::vector<std::string>::const_iterator li = files.begin(); + li != files.end(); ++li) { + if (cmHasLiteralPrefix(*li, "$<TARGET_OBJECTS:") && + (*li)[li->size() - 1] == '>') { + std::string objLibName = li->substr(17, li->size() - 18); + + if (cmGeneratorExpression::Find(objLibName) != std::string::npos) { continue; - } - cmGeneratorTarget *objLib = - this->LocalGenerator->FindGeneratorTargetToUse(objLibName); - if(objLib) - { + } + cmGeneratorTarget* objLib = + this->LocalGenerator->FindGeneratorTargetToUse(objLibName); + if (objLib) { objlibs.push_back(objLib); - } } } } + } } std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const @@ -5554,227 +4772,190 @@ std::string cmGeneratorTarget::CheckCMP0004(std::string const& item) const // do the expansion but users link to libraries like " ${VAR} ". std::string lib = item; std::string::size_type pos = lib.find_first_not_of(" \t\r\n"); - if(pos != lib.npos) - { + if (pos != lib.npos) { lib = lib.substr(pos, lib.npos); - } + } pos = lib.find_last_not_of(" \t\r\n"); - if(pos != lib.npos) - { - lib = lib.substr(0, pos+1); - } - if(lib != item) - { + if (pos != lib.npos) { + lib = lib.substr(0, pos + 1); + } + if (lib != item) { cmake* cm = this->LocalGenerator->GetCMakeInstance(); - switch(this->GetPolicyStatusCMP0004()) - { - case cmPolicies::WARN: - { + switch (this->GetPolicyStatusCMP0004()) { + case cmPolicies::WARN: { std::ostringstream w; w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0004) << "\n" - << "Target \"" << this->GetName() << "\" links to item \"" - << item << "\" which has leading or trailing whitespace."; - cm->IssueMessage(cmake::AUTHOR_WARNING, w.str(), - this->GetBacktrace()); - } + << "Target \"" << this->GetName() << "\" links to item \"" << item + << "\" which has leading or trailing whitespace."; + cm->IssueMessage(cmake::AUTHOR_WARNING, w.str(), this->GetBacktrace()); + } case cmPolicies::OLD: break; - case cmPolicies::NEW: - { + case cmPolicies::NEW: { std::ostringstream e; - e << "Target \"" << this->GetName() << "\" links to item \"" - << item << "\" which has leading or trailing whitespace. " + e << "Target \"" << this->GetName() << "\" links to item \"" << item + << "\" which has leading or trailing whitespace. " << "This is now an error according to policy CMP0004."; - cm->IssueMessage(cmake::FATAL_ERROR, e.str(), - this->GetBacktrace()); - } - break; + cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace()); + } break; case cmPolicies::REQUIRED_IF_USED: - case cmPolicies::REQUIRED_ALWAYS: - { + case cmPolicies::REQUIRED_ALWAYS: { std::ostringstream e; e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0004) << "\n" - << "Target \"" << this->GetName() << "\" links to item \"" - << item << "\" which has leading or trailing whitespace."; - cm->IssueMessage(cmake::FATAL_ERROR, e.str(), - this->GetBacktrace()); - } - break; - } + << "Target \"" << this->GetName() << "\" links to item \"" << item + << "\" which has leading or trailing whitespace."; + cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace()); + } break; } + } return lib; } void cmGeneratorTarget::GetLanguages(std::set<std::string>& languages, - const std::string& config) const + const std::string& config) const { std::vector<cmSourceFile*> sourceFiles; this->GetSourceFiles(sourceFiles, config); - for(std::vector<cmSourceFile*>::const_iterator - i = sourceFiles.begin(); i != sourceFiles.end(); ++i) - { + for (std::vector<cmSourceFile*>::const_iterator i = sourceFiles.begin(); + i != sourceFiles.end(); ++i) { const std::string& lang = (*i)->GetLanguage(); - if(!lang.empty()) - { + if (!lang.empty()) { languages.insert(lang); - } } + } std::vector<cmGeneratorTarget*> objectLibraries; std::vector<cmSourceFile const*> externalObjects; - if (!this->GlobalGenerator->GetConfigureDoneCMP0026()) - { + if (!this->GlobalGenerator->GetConfigureDoneCMP0026()) { std::vector<cmGeneratorTarget*> objectTargets; this->GetObjectLibrariesCMP0026(objectTargets); objectLibraries.reserve(objectTargets.size()); for (std::vector<cmGeneratorTarget*>::const_iterator it = - objectTargets.begin(); it != objectTargets.end(); ++it) - { + objectTargets.begin(); + it != objectTargets.end(); ++it) { objectLibraries.push_back(*it); - } } - else - { + } else { this->GetExternalObjects(externalObjects, config); - for(std::vector<cmSourceFile const*>::const_iterator - i = externalObjects.begin(); i != externalObjects.end(); ++i) - { + for (std::vector<cmSourceFile const*>::const_iterator i = + externalObjects.begin(); + i != externalObjects.end(); ++i) { std::string objLib = (*i)->GetObjectLibrary(); if (cmGeneratorTarget* tgt = - this->LocalGenerator->FindGeneratorTargetToUse(objLib)) - { + this->LocalGenerator->FindGeneratorTargetToUse(objLib)) { objectLibraries.push_back(tgt); - } } } - for(std::vector<cmGeneratorTarget*>::const_iterator - i = objectLibraries.begin(); i != objectLibraries.end(); ++i) - { + } + for (std::vector<cmGeneratorTarget*>::const_iterator i = + objectLibraries.begin(); + i != objectLibraries.end(); ++i) { (*i)->GetLanguages(languages, config); - } + } } void cmGeneratorTarget::ComputeLinkImplementationLanguages( - const std::string& config, - cmOptionalLinkImplementation& impl) const + const std::string& config, cmOptionalLinkImplementation& impl) const { // This target needs runtime libraries for its source languages. std::set<std::string> languages; // Get languages used in our source files. this->GetLanguages(languages, config); // Copy the set of langauges to the link implementation. - impl.Languages.insert(impl.Languages.begin(), - languages.begin(), languages.end()); + impl.Languages.insert(impl.Languages.begin(), languages.begin(), + languages.end()); } bool cmGeneratorTarget::HaveBuildTreeRPATH(const std::string& config) const { - if (this->GetPropertyAsBool("SKIP_BUILD_RPATH")) - { + if (this->GetPropertyAsBool("SKIP_BUILD_RPATH")) { return false; - } - if(cmLinkImplementationLibraries const* impl = - this->GetLinkImplementationLibraries(config)) - { + } + if (cmLinkImplementationLibraries const* impl = + this->GetLinkImplementationLibraries(config)) { return !impl->Libraries.empty(); - } + } return false; } cmLinkImplementationLibraries const* cmGeneratorTarget::GetLinkImplementationLibraries( - const std::string& config) const + const std::string& config) const { return this->GetLinkImplementationLibrariesInternal(config, this); } cmLinkImplementationLibraries const* cmGeneratorTarget::GetLinkImplementationLibrariesInternal( - const std::string& config, cmGeneratorTarget const* head) const + const std::string& config, cmGeneratorTarget const* head) const { // There is no link implementation for imported targets. - if(this->IsImported()) - { + if (this->IsImported()) { return 0; - } + } // Populate the link implementation libraries for this configuration. std::string CONFIG = cmSystemTools::UpperCase(config); - HeadToLinkImplementationMap& hm = - this->LinkImplMap[CONFIG]; + HeadToLinkImplementationMap& hm = this->LinkImplMap[CONFIG]; // If the link implementation does not depend on the head target // then return the one we computed first. - if(!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) - { + if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { return &hm.begin()->second; - } + } cmOptionalLinkImplementation& impl = hm[head]; - if(!impl.LibrariesDone) - { + if (!impl.LibrariesDone) { impl.LibrariesDone = true; this->ComputeLinkImplementationLibraries(config, impl, head); - } + } return &impl; } -bool -cmGeneratorTarget::IsNullImpliedByLinkLibraries(const std::string &p) const +bool cmGeneratorTarget::IsNullImpliedByLinkLibraries( + const std::string& p) const { - return this->LinkImplicitNullProperties.find(p) - != this->LinkImplicitNullProperties.end(); + return this->LinkImplicitNullProperties.find(p) != + this->LinkImplicitNullProperties.end(); } void cmGeneratorTarget::ComputeLinkImplementationLibraries( - const std::string& config, - cmOptionalLinkImplementation& impl, + const std::string& config, cmOptionalLinkImplementation& impl, cmGeneratorTarget const* head) const { - cmStringRange entryRange = - this->Target->GetLinkImplementationEntries(); - cmBacktraceRange btRange = - this->Target->GetLinkImplementationBacktraces(); + cmStringRange entryRange = this->Target->GetLinkImplementationEntries(); + cmBacktraceRange btRange = this->Target->GetLinkImplementationBacktraces(); cmBacktraceRange::const_iterator btIt = btRange.begin(); // Collect libraries directly linked in this configuration. for (cmStringRange::const_iterator le = entryRange.begin(), - end = entryRange.end(); le != end; ++le, ++btIt) - { + end = entryRange.end(); + le != end; ++le, ++btIt) { std::vector<std::string> llibs; - cmGeneratorExpressionDAGChecker dagChecker( - this->GetName(), - "LINK_LIBRARIES", 0, 0); + cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), + "LINK_LIBRARIES", 0, 0); cmGeneratorExpression ge(*btIt); - cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge = - ge.Parse(*le); + cmsys::auto_ptr<cmCompiledGeneratorExpression> const cge = ge.Parse(*le); std::string const evaluated = cge->Evaluate(this->LocalGenerator, config, false, head, &dagChecker); cmSystemTools::ExpandListArgument(evaluated, llibs); - if(cge->GetHadHeadSensitiveCondition()) - { + if (cge->GetHadHeadSensitiveCondition()) { impl.HadHeadSensitiveCondition = true; - } + } - for(std::vector<std::string>::const_iterator li = llibs.begin(); - li != llibs.end(); ++li) - { + for (std::vector<std::string>::const_iterator li = llibs.begin(); + li != llibs.end(); ++li) { // Skip entries that resolve to the target itself or are empty. std::string name = this->CheckCMP0004(*li); - if(name == this->GetName() || name.empty()) - { - if(name == this->GetName()) - { + if (name == this->GetName() || name.empty()) { + if (name == this->GetName()) { bool noMessage = false; cmake::MessageType messageType = cmake::FATAL_ERROR; std::ostringstream e; - switch(this->GetPolicyStatusCMP0038()) - { - case cmPolicies::WARN: - { + switch (this->GetPolicyStatusCMP0038()) { + case cmPolicies::WARN: { e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0038) << "\n"; messageType = cmake::AUTHOR_WARNING; - } - break; + } break; case cmPolicies::OLD: noMessage = true; case cmPolicies::REQUIRED_IF_USED: @@ -5782,125 +4963,112 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries( case cmPolicies::NEW: // Issue the fatal message. break; - } + } - if(!noMessage) - { + if (!noMessage) { e << "Target \"" << this->GetName() << "\" links to itself."; this->LocalGenerator->GetCMakeInstance()->IssueMessage( messageType, e.str(), this->GetBacktrace()); - if (messageType == cmake::FATAL_ERROR) - { + if (messageType == cmake::FATAL_ERROR) { return; - } } } - continue; } + continue; + } // The entry is meant for this configuration. - impl.Libraries.push_back( - cmLinkImplItem(name, this->FindTargetToLink(name), - *btIt, evaluated != *le)); - } + impl.Libraries.push_back(cmLinkImplItem( + name, this->FindTargetToLink(name), *btIt, evaluated != *le)); + } std::set<std::string> const& seenProps = cge->GetSeenTargetProperties(); for (std::set<std::string>::const_iterator it = seenProps.begin(); - it != seenProps.end(); ++it) - { - if (!this->GetProperty(*it)) - { + it != seenProps.end(); ++it) { + if (!this->GetProperty(*it)) { this->LinkImplicitNullProperties.insert(*it); - } } - cge->GetMaxLanguageStandard(this, - this->MaxLanguageStandards); } + cge->GetMaxLanguageStandard(this, this->MaxLanguageStandards); + } // Get the list of configurations considered to be DEBUG. std::vector<std::string> debugConfigs = this->Makefile->GetCMakeInstance()->GetDebugConfigs(); cmTargetLinkLibraryType linkType = - CMP0003_ComputeLinkType(config, debugConfigs); + CMP0003_ComputeLinkType(config, debugConfigs); cmTarget::LinkLibraryVectorType const& oldllibs = this->Target->GetOriginalLinkLibraries(); - for(cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin(); - li != oldllibs.end(); ++li) - { - if(li->second != GENERAL_LibraryType && li->second != linkType) - { + for (cmTarget::LinkLibraryVectorType::const_iterator li = oldllibs.begin(); + li != oldllibs.end(); ++li) { + if (li->second != GENERAL_LibraryType && li->second != linkType) { std::string name = this->CheckCMP0004(li->first); - if(name == this->GetName() || name.empty()) - { + if (name == this->GetName() || name.empty()) { continue; - } + } // Support OLD behavior for CMP0003. impl.WrongConfigLibraries.push_back( cmLinkItem(name, this->FindTargetToLink(name))); - } } + } } -cmGeneratorTarget* -cmGeneratorTarget::FindTargetToLink(std::string const& name) const +cmGeneratorTarget* cmGeneratorTarget::FindTargetToLink( + std::string const& name) const { cmGeneratorTarget* tgt = - this->LocalGenerator->FindGeneratorTargetToUse(name); + this->LocalGenerator->FindGeneratorTargetToUse(name); // Skip targets that will not really be linked. This is probably a // name conflict between an external library and an executable // within the project. - if(tgt && tgt->GetType() == cmState::EXECUTABLE && - !tgt->IsExecutableWithExports()) - { + if (tgt && tgt->GetType() == cmState::EXECUTABLE && + !tgt->IsExecutableWithExports()) { tgt = 0; - } + } - if(tgt && tgt->GetType() == cmState::OBJECT_LIBRARY) - { + if (tgt && tgt->GetType() == cmState::OBJECT_LIBRARY) { std::ostringstream e; e << "Target \"" << this->GetName() << "\" links to " - "OBJECT library \"" << tgt->GetName() << "\" but this is not " - "allowed. " - "One may link only to STATIC or SHARED libraries, or to executables " - "with the ENABLE_EXPORTS property set."; + "OBJECT library \"" + << tgt->GetName() + << "\" but this is not " + "allowed. " + "One may link only to STATIC or SHARED libraries, or to executables " + "with the ENABLE_EXPORTS property set."; cmake* cm = this->LocalGenerator->GetCMakeInstance(); - cm->IssueMessage(cmake::FATAL_ERROR, e.str(), - this->GetBacktrace()); + cm->IssueMessage(cmake::FATAL_ERROR, e.str(), this->GetBacktrace()); tgt = 0; - } + } return tgt; } -std::string -cmGeneratorTarget::GetPDBDirectory(const std::string& config) const +std::string cmGeneratorTarget::GetPDBDirectory(const std::string& config) const { - if(OutputInfo const* info = this->GetOutputInfo(config)) - { + if (OutputInfo const* info = this->GetOutputInfo(config)) { // Return the directory in which the target will be built. return info->PdbDir; - } + } return ""; } bool cmGeneratorTarget::HasImplibGNUtoMS() const { - return this->HasImportLibrary() - && this->GetPropertyAsBool("GNUtoMS"); + return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS"); } bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName, - std::string& out, const char* newExt) const + std::string& out, + const char* newExt) const { - if(this->HasImplibGNUtoMS() && - gnuName.size() > 6 && gnuName.substr(gnuName.size()-6) == ".dll.a") - { - out = gnuName.substr(0, gnuName.size()-6); - out += newExt? newExt : ".lib"; + if (this->HasImplibGNUtoMS() && gnuName.size() > 6 && + gnuName.substr(gnuName.size() - 6) == ".dll.a") { + out = gnuName.substr(0, gnuName.size() - 6); + out += newExt ? newExt : ".lib"; return true; - } + } return false; } @@ -5957,13 +5125,11 @@ bool cmGeneratorTarget::IsAppBundleOnApple() const bool cmGeneratorTarget::IsXCTestOnApple() const { - return (this->IsCFBundleOnApple() && - this->GetPropertyAsBool("XCTEST")); + return (this->IsCFBundleOnApple() && this->GetPropertyAsBool("XCTEST")); } bool cmGeneratorTarget::IsCFBundleOnApple() const { return (this->GetType() == cmState::MODULE_LIBRARY && - this->Makefile->IsOn("APPLE") && - this->GetPropertyAsBool("BUNDLE")); + this->Makefile->IsOn("APPLE") && this->GetPropertyAsBool("BUNDLE")); } |