kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Fix line-too-long style errors 

Commit 59139031 (include_external_msproject: Add TYPE, GUID, PLATFORM
options, 2012-04-16) introduced some long lines.  Wrap them.
This commit is contained in:
Brad King 2012-04-19 10:06:59 -04:00
parent 8787f946b7
commit b8034104c1
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -282,7 +282,8 @@ void cmGlobalVisualStudio71Generator
// executables to the libraries it uses are also done here // executables to the libraries it uses are also done here
void cmGlobalVisualStudio71Generator void cmGlobalVisualStudio71Generator
::WriteProjectConfigurations(std::ostream& fout, const char* name, ::WriteProjectConfigurations(std::ostream& fout, const char* name,
bool partOfDefaultBuild, const char* platformMapping) bool partOfDefaultBuild,
const char* platformMapping)
{ {
std::string guid = this->GetGUID(name); std::string guid = this->GetGUID(name);
for(std::vector<std::string>::iterator i = this->Configurations.begin(); for(std::vector<std::string>::iterator i = this->Configurations.begin();

9
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -250,9 +250,9 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
const char* expath = target->GetProperty("EXTERNAL_MSPROJECT"); const char* expath = target->GetProperty("EXTERNAL_MSPROJECT");
if(expath) if(expath)
{ {
this->WriteProjectConfigurations(fout, target->GetName(), this->WriteProjectConfigurations(
true, fout, target->GetName(),
target->GetProperty("VS_PLATFORM_MAPPING")); true, target->GetProperty("VS_PLATFORM_MAPPING"));
} }
else else
{ {
@ -585,7 +585,8 @@ cmGlobalVisualStudio7Generator
// executables to the libraries it uses are also done here // executables to the libraries it uses are also done here
void cmGlobalVisualStudio7Generator void cmGlobalVisualStudio7Generator
::WriteProjectConfigurations(std::ostream& fout, const char* name, ::WriteProjectConfigurations(std::ostream& fout, const char* name,
bool partOfDefaultBuild, const char* platformMapping) bool partOfDefaultBuild,
const char* platformMapping)
{ {
std::string guid = this->GetGUID(name); std::string guid = this->GetGUID(name);
for(std::vector<std::string>::iterator i = this->Configurations.begin(); for(std::vector<std::string>::iterator i = this->Configurations.begin();

9
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -270,7 +270,8 @@ cmGlobalVisualStudio8Generator
void void
cmGlobalVisualStudio8Generator cmGlobalVisualStudio8Generator
::WriteProjectConfigurations(std::ostream& fout, const char* name, ::WriteProjectConfigurations(std::ostream& fout, const char* name,
bool partOfDefaultBuild, const char* platformMapping) bool partOfDefaultBuild,
const char* platformMapping)
{ {
std::string guid = this->GetGUID(name); std::string guid = this->GetGUID(name);
for(std::vector<std::string>::iterator i = this->Configurations.begin(); for(std::vector<std::string>::iterator i = this->Configurations.begin();
@ -278,12 +279,14 @@ cmGlobalVisualStudio8Generator
{ {
fout << "\t\t{" << guid << "}." << *i fout << "\t\t{" << guid << "}." << *i
<< "|" << this->GetPlatformName() << ".ActiveCfg = " << *i << "|" << "|" << this->GetPlatformName() << ".ActiveCfg = " << *i << "|"
<< (platformMapping ? platformMapping : this->GetPlatformName()) << "\n"; << (platformMapping ? platformMapping : this->GetPlatformName())
<< "\n";
if(partOfDefaultBuild) if(partOfDefaultBuild)
{ {
fout << "\t\t{" << guid << "}." << *i fout << "\t\t{" << guid << "}." << *i
<< "|" << this->GetPlatformName() << ".Build.0 = " << *i << "|" << "|" << this->GetPlatformName() << ".Build.0 = " << *i << "|"
<< (platformMapping ? platformMapping : this->GetPlatformName()) << "\n"; << (platformMapping ? platformMapping : this->GetPlatformName())
<< "\n";
} }
} }
} }

7
Source/cmIncludeExternalMSProjectCommand.cxx
View File

@ -71,10 +71,9 @@ bool cmIncludeExternalMSProjectCommand
if (!customGuid.empty()) if (!customGuid.empty())
{ {
std::string guidVariable = utility_name + "_GUID_CMAKE"; std::string guidVariable = utility_name + "_GUID_CMAKE";
this->Makefile->GetCMakeInstance()->AddCacheEntry(guidVariable.c_str(), this->Makefile->GetCMakeInstance()->AddCacheEntry(
customGuid.c_str(), guidVariable.c_str(), customGuid.c_str(),
"Stored GUID", "Stored GUID", cmCacheManager::INTERNAL);
cmCacheManager::INTERNAL);
} }
// Create a target instance for this utility. // Create a target instance for this utility.