[Cmake-commits] CMake branch, next, updated. v3.3.0-1709-gb3c1ffa
Stephen Kelly
steveire at gmail.com
Sat Aug 1 03:44:45 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 b3c1ffa8c5b38866434bb5db5e0c788684db83d5 (commit)
via a45307477f84bfc58127f346c1f26bd917d6a4ea (commit)
via 2f3c0dbac88f7f7a4cce62fd6ef64b048dfe10f2 (commit)
via bef7a0f785b8192e11d26ae761d0ae7a2856d8a6 (commit)
via 59a9f3c275a5f5f763d392802da3ff2ae4d1b8f5 (commit)
from 425a983649ec4f59b33a22b6f94cb91232ac872a (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3c1ffa8c5b38866434bb5db5e0c788684db83d5
commit b3c1ffa8c5b38866434bb5db5e0c788684db83d5
Merge: 425a983 a453074
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 03:44:44 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 1 03:44:44 2015 -0400
Merge topic 'use-generator-target' into next
a4530747 fixup! cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.
2f3c0dba fixup! cmGeneratorTarget: Move GetFullName from cmTarget.
bef7a0f7 fixup! cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.
59a9f3c2 fixup! cmGeneratorTarget: Move GetFullName from cmTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a45307477f84bfc58127f346c1f26bd917d6a4ea
commit a45307477f84bfc58127f346c1f26bd917d6a4ea
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 09:38:06 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 1 09:38:06 2015 +0200
fixup! cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 390198d..80b8591 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1891,40 +1891,10 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
this->GeneratorTarget->GetLinkerLanguage(configName.c_str());
if(linkLanguage.empty())
{
- const std::string& linkLanguage =
- this->GeneratorTarget->GetLinkerLanguage(configName.c_str());
- if(linkLanguage.empty())
- {
- cmSystemTools::Error
- ("CMake can not determine linker language for target: ",
- this->Name.c_str());
- return false;
- }
- if(linkLanguage == "C" || linkLanguage == "CXX"
- || linkLanguage == "Fortran")
- {
- std::string baseFlagVar = "CMAKE_";
- baseFlagVar += linkLanguage;
- baseFlagVar += "_FLAGS";
- flags = this->
- Target->GetMakefile()->GetRequiredDefinition(baseFlagVar.c_str());
- std::string flagVar = baseFlagVar + std::string("_") +
- cmSystemTools::UpperCase(configName);
- flags += " ";
- flags += this->
- Target->GetMakefile()->GetRequiredDefinition(flagVar.c_str());
- }
- // set the correct language
- if(linkLanguage == "C")
- {
- flags += " /TC ";
- }
- if(linkLanguage == "CXX")
- {
- flags += " /TP ";
- }
- this->LocalGenerator->AddCompileOptions(flags, this->Target,
- linkLanguage, configName.c_str());
+ cmSystemTools::Error
+ ("CMake can not determine linker language for target: ",
+ this->Name.c_str());
+ return false;
}
if(linkLanguage == "C" || linkLanguage == "CXX"
|| linkLanguage == "Fortran")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f3c0dbac88f7f7a4cce62fd6ef64b048dfe10f2
commit 2f3c0dbac88f7f7a4cce62fd6ef64b048dfe10f2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 09:35:55 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 1 09:35:55 2015 +0200
fixup! cmGeneratorTarget: Move GetFullName from cmTarget.
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index a402c64..e1fa7d4 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1112,8 +1112,8 @@ void cmLocalVisualStudio6Generator
// Compute the proper name to use to link this library.
std::string lib;
std::string libDebug;
- cmGeneratorTarget* tgt =
- this->GlobalGenerator->FindGeneratorTarget(j->first.c_str());
+ cmGeneratorTarget* tgt = this->GlobalGenerator->GetGeneratorTarget(
+ this->GlobalGenerator->FindTarget(j->first.c_str()));
if(tgt)
{
lib = cmSystemTools::GetFilenameWithoutExtension
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bef7a0f785b8192e11d26ae761d0ae7a2856d8a6
commit bef7a0f785b8192e11d26ae761d0ae7a2856d8a6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 09:28:50 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 1 09:28:50 2015 +0200
fixup! cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 2f9265a..1e57c33 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -128,7 +128,8 @@ void cmGhsMultiTargetGenerator::Generate()
{
config = "RELEASE";
}
- const std::string language(this->Target->GetLinkerLanguage(config));
+ const std::string language(
+ this->GeneratorTarget->GetLinkerLanguage(config));
config = cmSystemTools::UpperCase(config);
this->DynamicDownload = this->DetermineIfDynamicDownload(config, language);
if (this->DynamicDownload)
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8a780b1..390198d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1888,7 +1888,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
std::string flags;
const std::string& linkLanguage =
- this->Target->GetLinkerLanguage(configName.c_str());
+ this->GeneratorTarget->GetLinkerLanguage(configName.c_str());
if(linkLanguage.empty())
{
const std::string& linkLanguage =
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59a9f3c275a5f5f763d392802da3ff2ae4d1b8f5
commit 59a9f3c275a5f5f763d392802da3ff2ae4d1b8f5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 1 09:26:44 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 1 09:26:44 2015 +0200
fixup! cmGeneratorTarget: Move GetFullName from cmTarget.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0fb6bc0..48b610b 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -805,7 +805,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
if (this->FortranProject)
{
// Intel Fortran >= 15.0 uses TargetName property.
- std::string targetNameFull = target.GetFullName(configName);
+ std::string targetNameFull = gt->GetFullName(configName);
std::string targetName =
cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
std::string targetExt =
-----------------------------------------------------------------------
Summary of changes:
Source/cmGhsMultiTargetGenerator.cxx | 3 ++-
Source/cmLocalVisualStudio6Generator.cxx | 4 +--
Source/cmLocalVisualStudio7Generator.cxx | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 40 ++++------------------------
4 files changed, 10 insertions(+), 39 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list