summaryrefslogtreecommitdiffstats
path: root/Source/cmAuxSourceDirectoryCommand.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmAuxSourceDirectoryCommand.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2
Revise C++ coding style using clang-format
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.
Diffstat (limited to 'Source/cmAuxSourceDirectoryCommand.cxx')
-rw-r--r--Source/cmAuxSourceDirectoryCommand.cxx56
1 files changed, 22 insertions, 34 deletions
diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index 07cb295..78f67a4 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -16,74 +16,62 @@
#include <cmsys/Directory.hxx>
// cmAuxSourceDirectoryCommand
-bool cmAuxSourceDirectoryCommand::InitialPass
-(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmAuxSourceDirectoryCommand::InitialPass(
+ std::vector<std::string> const& args, cmExecutionStatus&)
{
- if(args.size() < 2 || args.size() > 2)
- {
+ if (args.size() < 2 || args.size() > 2) {
this->SetError("called with incorrect number of arguments");
return false;
- }
+ }
std::string sourceListValue;
std::string templateDirectory = args[0];
std::string tdir;
- if(!cmSystemTools::FileIsFullPath(templateDirectory.c_str()))
- {
+ if (!cmSystemTools::FileIsFullPath(templateDirectory.c_str())) {
tdir = this->Makefile->GetCurrentSourceDirectory();
tdir += "/";
tdir += templateDirectory;
- }
- else
- {
+ } else {
tdir = templateDirectory;
- }
+ }
// was the list already populated
- const char *def = this->Makefile->GetDefinition(args[1]);
- if (def)
- {
+ const char* def = this->Makefile->GetDefinition(args[1]);
+ if (def) {
sourceListValue = def;
- }
+ }
// Load all the files in the directory
cmsys::Directory dir;
- if(dir.Load(tdir.c_str()))
- {
+ if (dir.Load(tdir.c_str())) {
size_t numfiles = dir.GetNumberOfFiles();
- for(size_t i =0; i < numfiles; ++i)
- {
+ for (size_t i = 0; i < numfiles; ++i) {
std::string file = dir.GetFile(static_cast<unsigned long>(i));
// Split the filename into base and extension
std::string::size_type dotpos = file.rfind(".");
- if( dotpos != std::string::npos )
- {
- std::string ext = file.substr(dotpos+1);
+ if (dotpos != std::string::npos) {
+ std::string ext = file.substr(dotpos + 1);
std::string base = file.substr(0, dotpos);
// Process only source files
std::vector<std::string> srcExts =
- this->Makefile->GetCMakeInstance()->GetSourceExtensions();
- if(!base.empty() &&
- std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
- {
+ this->Makefile->GetCMakeInstance()->GetSourceExtensions();
+ if (!base.empty() &&
+ std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end()) {
std::string fullname = templateDirectory;
fullname += "/";
fullname += file;
// add the file as a class file so
// depends can be done
- cmSourceFile* sf =
- this->Makefile->GetOrCreateSource(fullname);
- sf->SetProperty("ABSTRACT","0");
- if(!sourceListValue.empty())
- {
+ cmSourceFile* sf = this->Makefile->GetOrCreateSource(fullname);
+ sf->SetProperty("ABSTRACT", "0");
+ if (!sourceListValue.empty()) {
sourceListValue += ";";
- }
- sourceListValue += fullname;
}
+ sourceListValue += fullname;
}
}
}
+ }
this->Makefile->AddDefinition(args[1], sourceListValue.c_str());
return true;
}
-