mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revise C++ coding style using clang-format

Browse Source 
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.
This commit is contained in:
Kitware Robot
2016-05-16 10:34:04 -04:00
committed by Brad King
parent 82df6deaaf
commit d9fd2f5402
1450 changed files with 62404 additions and 83728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Source/cmExportTryCompileFileGenerator.cxx
View File

@@ -18,9 +18,8 @@
#include "cmLocalGenerator.h"
cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
cmGlobalGenerator* gg,
const std::vector<std::string>& targets,
cmMakefile* mf)
cmGlobalGenerator* gg, const std::vector<std::string>& targets,
cmMakefile* mf)
{
gg->CreateImportedGenerationObjects(mf, targets, this->Exports);
}
@@ -29,19 +28,17 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
{
std::set<cmGeneratorTarget const*> emitted;
std::set<cmGeneratorTarget const*> emittedDeps;
while(!this->Exports.empty())
{
while (!this->Exports.empty()) {
cmGeneratorTarget const* te = this->Exports.back();
this->Exports.pop_back();
if (emitted.insert(te).second)
{
if (emitted.insert(te).second) {
emittedDeps.insert(te);
this->GenerateImportTargetCode(os, te);
ImportPropertyMap properties;
#define FIND_TARGETS(PROPERTY) \
this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
#define FIND_TARGETS(PROPERTY) \
this->FindTargets("INTERFACE_" #PROPERTY, te, emittedDeps);
CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(FIND_TARGETS)
@@ -50,27 +47,23 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
this->PopulateProperties(te, properties, emittedDeps);
this->GenerateInterfaceProperties(te, os, properties);
}
}
}
return true;
}
std::string cmExportTryCompileFileGenerator::FindTargets(
const std::string& propName,
cmGeneratorTarget const* tgt,
std::set<cmGeneratorTarget const*> &emitted)
const std::string& propName, cmGeneratorTarget const* tgt,
std::set<cmGeneratorTarget const*>& emitted)
{
const char *prop = tgt->GetProperty(propName);
if(!prop)
{
const char* prop = tgt->GetProperty(propName);
if (!prop) {
return std::string();
}
}
cmGeneratorExpression ge;
cmGeneratorExpressionDAGChecker dagChecker(
tgt->GetName(),
propName, 0, 0);
cmGeneratorExpressionDAGChecker dagChecker(tgt->GetName(), propName, 0, 0);
cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(prop);
@@ -81,70 +74,58 @@ std::string cmExportTryCompileFileGenerator::FindTargets(
cmGeneratorTarget gDummyHead(&dummyHead, tgt->GetLocalGenerator());
std::string result = cge->Evaluate(tgt->GetLocalGenerator(), this->Config,
false, &gDummyHead,
tgt, &dagChecker);
false, &gDummyHead, tgt, &dagChecker);
const std::set<cmGeneratorTarget const*> &allTargets =
cge->GetAllTargetsSeen();
for(std::set<cmGeneratorTarget const*>::const_iterator li =
allTargets.begin(); li != allTargets.end(); ++li)
{
if(emitted.insert(*li).second)
{
const std::set<cmGeneratorTarget const*>& allTargets =
cge->GetAllTargetsSeen();
for (std::set<cmGeneratorTarget const*>::const_iterator li =
allTargets.begin();
li != allTargets.end(); ++li) {
if (emitted.insert(*li).second) {
this->Exports.push_back(*li);
}
}
}
return result;
}
void
cmExportTryCompileFileGenerator::PopulateProperties(
const cmGeneratorTarget* target,
ImportPropertyMap& properties,
std::set<cmGeneratorTarget const*> &emitted)
void cmExportTryCompileFileGenerator::PopulateProperties(
const cmGeneratorTarget* target, ImportPropertyMap& properties,
std::set<cmGeneratorTarget const*>& emitted)
{
std::vector<std::string> props = target->GetPropertyKeys();
for(std::vector<std::string>::const_iterator i = props.begin();
i != props.end(); ++i)
{
for (std::vector<std::string>::const_iterator i = props.begin();
i != props.end(); ++i) {
properties[*i] = target->GetProperty(*i);
if(i->find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0
|| i->find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0
|| i->find("INTERFACE_LINK_LIBRARIES") == 0)
{
std::string evalResult = this->FindTargets(*i,
target, emitted);
if (i->find("IMPORTED_LINK_INTERFACE_LIBRARIES") == 0 ||
i->find("IMPORTED_LINK_DEPENDENT_LIBRARIES") == 0 ||
i->find("INTERFACE_LINK_LIBRARIES") == 0) {
std::string evalResult = this->FindTargets(*i, target, emitted);
std::vector<std::string> depends;
cmSystemTools::ExpandListArgument(evalResult, depends);
for(std::vector<std::string>::const_iterator li = depends.begin();
li != depends.end(); ++li)
{
cmGeneratorTarget *tgt =
target->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
if(tgt && emitted.insert(tgt).second)
{
for (std::vector<std::string>::const_iterator li = depends.begin();
li != depends.end(); ++li) {
cmGeneratorTarget* tgt =
target->GetLocalGenerator()->FindGeneratorTargetToUse(*li);
if (tgt && emitted.insert(tgt).second) {
this->Exports.push_back(tgt);
}
}
}
}
}
}
std::string
cmExportTryCompileFileGenerator::InstallNameDir(cmGeneratorTarget* target,
const std::string& config)
std::string cmExportTryCompileFileGenerator::InstallNameDir(
cmGeneratorTarget* target, const std::string& config)
{
std::string install_name_dir;
cmMakefile* mf = target->Target->GetMakefile();
if(mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
{
install_name_dir =
target->GetInstallNameDirForBuildTree(config);
}
if (mf->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) {
install_name_dir = target->GetInstallNameDirForBuildTree(config);
}
return install_name_dir;
}