[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-892-g2eb7d97
Stephen Kelly
steveire at gmail.com
Thu Oct 22 12:43:31 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2eb7d97faf19dd8e545aac544fba318a86383e36 (commit)
via a8afd07610a92140e7f47af1672cec2441d929a4 (commit)
from ade9860f531113e13ce2c5acb2cbc38797ef3556 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2eb7d97faf19dd8e545aac544fba318a86383e36
commit 2eb7d97faf19dd8e545aac544fba318a86383e36
Merge: ade9860 a8afd07
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 12:43:30 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 12:43:30 2015 -0400
Merge topic 'use-generator-target' into next
a8afd076 Fix whitespace.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8afd07610a92140e7f47af1672cec2441d929a4
commit a8afd07610a92140e7f47af1672cec2441d929a4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 22 18:43:04 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 22 18:43:04 2015 +0200
Fix whitespace.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 0d579bf..e568704 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -594,7 +594,8 @@ void cmGlobalVisualStudio10Generator::PathTooLong(
cmGeneratorTarget *target, cmSourceFile const* sf,
std::string const& sfRel)
{
- size_t len = (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
+ size_t len =
+ (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
1 + sfRel.length());
if(len > this->LongestSource.Length)
{
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 6b98ab6..48c07a8 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -235,12 +235,13 @@ void cmGlobalVisualStudio6Generator
std::string project = target->GetName();
std::string location = expath;
this->WriteExternalProject(fout, project.c_str(),
- location.c_str(), target->Target->GetUtilities());
+ location.c_str(), target->Target->GetUtilities());
}
else
{
std::string dspname = GetVS6TargetName(target->GetName());
- std::string dir = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
+ std::string dir =
+ target->GetLocalGenerator()->GetCurrentBinaryDirectory();
dir = root->Convert(dir.c_str(), cmLocalGenerator::START_OUTPUT);
this->WriteProject(fout, dspname.c_str(), dir.c_str(), target);
}
@@ -287,9 +288,9 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
// Note, that dependencies from executables to
// the libraries it uses are also done here
void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
- const std::string& dspname,
- const char* dir,
- const cmGeneratorTarget *target)
+ const std::string& dspname,
+ const char* dir,
+ const cmGeneratorTarget *target)
{
fout << "#########################################################"
"######################\n\n";
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 3ab6169..b6caf5b 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -94,7 +94,8 @@ public:
/** Return true if the target project file should have the option
LinkLibraryDependencies and link to .sln dependencies. */
- virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*) { return false; }
+ virtual bool NeedLinkLibraryDependencies(cmGeneratorTarget*)
+ { return false; }
const char* GetIntelProjectVersion();
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 606e215..31f6475 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -394,7 +394,8 @@ static bool VSLinkable(cmGeneratorTarget const* t)
}
//----------------------------------------------------------------------------
-void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmGeneratorTarget* target)
+void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
+ cmGeneratorTarget* target)
{
if(this->VSTargetDepends.find(target) != this->VSTargetDepends.end())
{
@@ -506,7 +507,8 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
//----------------------------------------------------------------------------
std::string
-cmGlobalVisualStudioGenerator::GetUtilityDepend(cmGeneratorTarget const* target)
+cmGlobalVisualStudioGenerator::GetUtilityDepend(
+ cmGeneratorTarget const* target)
{
UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
if(i == this->UtilityDepends.end())
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 83602bd..d529e2f 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -127,7 +127,8 @@ protected:
void ComputeVSTargetDepends(cmGeneratorTarget *);
bool CheckTargetLinks(cmGeneratorTarget& target, const std::string& name);
- std::string GetUtilityForTarget(cmGeneratorTarget& target, const std::string&);
+ std::string GetUtilityForTarget(cmGeneratorTarget& target,
+ const std::string&);
virtual std::string WriteUtilityDepend(cmGeneratorTarget const*) = 0;
std::string GetUtilityDepend(cmGeneratorTarget const* target);
typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 7fb2775..d5abf68 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -407,7 +407,8 @@ void cmLocalVisualStudio6Generator
std::string objectNameDir;
if(target->HasExplicitObjectName(*sf))
{
- objectNameDir = cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
+ objectNameDir =
+ cmSystemTools::GetFilenamePath(target->GetObjectName(*sf));
}
// Add per-source file flags.
@@ -1050,7 +1051,8 @@ void cmLocalVisualStudio6Generator
}
}
std::vector<std::string>::const_iterator i;
- const std::vector<std::string>& libdirs = target->Target->GetLinkDirectories();
+ const std::vector<std::string>& libdirs =
+ target->Target->GetLinkDirectories();
for(i = libdirs.begin(); i != libdirs.end(); ++i)
{
std::string path = *i;
@@ -1245,7 +1247,8 @@ void cmLocalVisualStudio6Generator
extraLinkOptionsRelease += targetLinkFlags;
}
- if(const char* targetLinkFlags = target->GetProperty("LINK_FLAGS_MINSIZEREL"))
+ if(const char* targetLinkFlags =
+ target->GetProperty("LINK_FLAGS_MINSIZEREL"))
{
extraLinkOptionsMinSizeRel += " ";
extraLinkOptionsMinSizeRel += targetLinkFlags;
diff --git a/Source/cmLocalVisualStudio6Generator.h b/Source/cmLocalVisualStudio6Generator.h
index b8be3d8..d0c8239 100644
--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@@ -50,7 +50,8 @@ public:
virtual
std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
- virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
+ virtual std::string ComputeLongestObjectDirectory(
+ cmGeneratorTarget const*) const;
private:
std::string DSPHeaderTemplate;
std::string DSPFooterTemplate;
@@ -84,7 +85,8 @@ private:
std::string CreateTargetRules(cmGeneratorTarget* target,
const std::string& configName,
const std::string& libName);
- void ComputeLinkOptions(cmGeneratorTarget* target, const std::string& configName,
+ void ComputeLinkOptions(cmGeneratorTarget* target,
+ const std::string& configName,
const std::string extraOptions,
std::string& options);
void OutputObjects(cmGeneratorTarget* target, const char* tool,
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 9444ccf..139d7c3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -34,7 +34,8 @@ public:
LocalGenerator(e) {}
typedef cmComputeLinkInformation::ItemVector ItemVector;
void OutputLibraries(std::ostream& fout, ItemVector const& libs);
- void OutputObjects(std::ostream& fout, cmGeneratorTarget* t, const char* isep = 0);
+ void OutputObjects(std::ostream& fout, cmGeneratorTarget* t,
+ const char* isep = 0);
private:
cmLocalVisualStudio7Generator* LocalGenerator;
};
@@ -322,7 +323,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
}
}
-void cmLocalVisualStudio7Generator::WriteConfigurations(std::ostream& fout, std::vector<std::string> const& configs,
+void cmLocalVisualStudio7Generator::WriteConfigurations(
+ std::ostream& fout,
+ std::vector<std::string> const& configs,
const std::string& libName, cmGeneratorTarget *target
)
{
@@ -2045,7 +2048,8 @@ void cmLocalVisualStudio7Generator
event.Write(target->Target->GetPreLinkCommands());
}
cmsys::auto_ptr<cmCustomCommand> pcc(
- this->MaybeCreateImplibDir(target, configName, this->FortranProject));
+ this->MaybeCreateImplibDir(target,
+ configName, this->FortranProject));
if(pcc.get())
{
event.Write(*pcc);
@@ -2209,8 +2213,9 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
}
-void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout,
- cmGeneratorTarget *target)
+void cmLocalVisualStudio7Generator::WriteVCProjFooter(
+ std::ostream& fout,
+ cmGeneratorTarget *target)
{
fout << "\t<Globals>\n";
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 0af65d1..b282098 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -56,7 +56,8 @@ public:
std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
cmSourceFile* CreateVCProjBuildRule();
void WriteStampFiles();
- virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
+ virtual std::string ComputeLongestObjectDirectory(
+ cmGeneratorTarget const*) const;
virtual void ReadAndStoreExternalGUID(const std::string& name,
const char* path);
@@ -72,7 +73,8 @@ private:
void FixGlobalTargets();
void WriteProjectFiles();
void WriteVCProjHeader(std::ostream& fout, const std::string& libName,
- cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
+ cmGeneratorTarget* tgt,
+ std::vector<cmSourceGroup> &sgs);
void WriteVCProjFooter(std::ostream& fout, cmGeneratorTarget* target);
void WriteVCProjFile(std::ostream& fout, const std::string& libName,
cmGeneratorTarget* tgt);
@@ -86,14 +88,16 @@ private:
std::string ConvertToXMLOutputPath(const char* path);
std::string ConvertToXMLOutputPathSingle(const char* path);
void OutputTargetRules(std::ostream& fout, const std::string& configName,
- cmGeneratorTarget* target, const std::string& libName);
+ cmGeneratorTarget* target,
+ const std::string& libName);
void OutputBuildTool(std::ostream& fout, const std::string& configName,
cmGeneratorTarget* t, const Options& targetOptions);
void OutputLibraryDirectories(std::ostream& fout,
std::vector<std::string> const& dirs);
void WriteProjectSCC(std::ostream& fout, cmGeneratorTarget *target);
void WriteProjectStart(std::ostream& fout, const std::string& libName,
- cmGeneratorTarget* tgt, std::vector<cmSourceGroup> &sgs);
+ cmGeneratorTarget* tgt,
+ std::vector<cmSourceGroup> &sgs);
void WriteProjectStartFortran(std::ostream& fout, const std::string& libName,
cmGeneratorTarget* tgt);
void WriteVCProjBeginGroup(std::ostream& fout,
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index ab2b5cc..21071e6 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -44,7 +44,8 @@ public:
cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
- virtual std::string ComputeLongestObjectDirectory(cmGeneratorTarget const*) const = 0;
+ virtual std::string ComputeLongestObjectDirectory(
+ cmGeneratorTarget const*) const = 0;
virtual void AddCMakeListsRules() = 0;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 06ae5fd..9c9f5ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -273,7 +273,8 @@ void cmVisualStudio10TargetGenerator::Generate()
return;
}
// Tell the global generator the name of the project file
- this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
+ this->GeneratorTarget->Target
+ ->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
this->GeneratorTarget->Target->SetProperty("GENERATOR_FILE_NAME_EXT",
".vcxproj");
if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
@@ -730,7 +731,8 @@ void cmVisualStudio10TargetGenerator
cmGlobalVisualStudio10Generator* gg =
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
const char* mfcFlag =
- this->GeneratorTarget->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
+ this->GeneratorTarget->
+ Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
std::string useOfMfcValue = "false";
@@ -1935,7 +1937,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
linkLanguage, configName.c_str());
// Get preprocessor definitions for this directory.
- std::string defineFlags = this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
+ std::string defineFlags =
+ this->GeneratorTarget->Target->GetMakefile()->GetDefineFlags();
if(this->MSTools)
{
clOptions.FixExceptionHandlingDefault();
@@ -2820,12 +2823,12 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
if (!addedPrelink)
{
this->WriteEvent("PreLinkEvent",
- this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
+ this->GeneratorTarget->Target->GetPreLinkCommands(), configName);
}
this->WriteEvent("PreBuildEvent",
- this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
+ this->GeneratorTarget->Target->GetPreBuildCommands(), configName);
this->WriteEvent("PostBuildEvent",
- this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
+ this->GeneratorTarget->Target->GetPostBuildCommands(), configName);
}
void cmVisualStudio10TargetGenerator::WriteEvent(
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio10Generator.cxx | 3 ++-
Source/cmGlobalVisualStudio6Generator.cxx | 11 ++++++-----
Source/cmGlobalVisualStudio7Generator.h | 3 ++-
Source/cmGlobalVisualStudioGenerator.cxx | 6 ++++--
Source/cmGlobalVisualStudioGenerator.h | 3 ++-
Source/cmLocalVisualStudio6Generator.cxx | 9 ++++++---
Source/cmLocalVisualStudio6Generator.h | 6 ++++--
Source/cmLocalVisualStudio7Generator.cxx | 15 ++++++++++-----
Source/cmLocalVisualStudio7Generator.h | 12 ++++++++----
Source/cmLocalVisualStudioGenerator.h | 3 ++-
Source/cmVisualStudio10TargetGenerator.cxx | 15 +++++++++------
11 files changed, 55 insertions(+), 31 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list