[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-37-gfb71eaf
Brad King
brad.king at kitware.com
Wed Feb 8 08:46:53 EST 2017
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 fb71eaf6b4b53ced12e208ee5905c5909deddf36 (commit)
via 86d2bb68b573a1d71bc6eb6c88287ff29baa3909 (commit)
from ca0b192713a2a4694394fa7b2dfbfaa96cb6f6b1 (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=fb71eaf6b4b53ced12e208ee5905c5909deddf36
commit fb71eaf6b4b53ced12e208ee5905c5909deddf36
Merge: ca0b192 86d2bb6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 8 08:46:50 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 8 08:46:50 2017 -0500
Merge topic 'lang-flag-order' into next
86d2bb68 Revert "Move language standard options to the beginning of compiler flags"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86d2bb68b573a1d71bc6eb6c88287ff29baa3909
commit 86d2bb68b573a1d71bc6eb6c88287ff29baa3909
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 8 08:46:28 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 8 08:46:28 2017 -0500
Revert "Move language standard options to the beginning of compiler flags"
This reverts commit b99d0e064557f6d59da35da34a7d5ae39cd44644.
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 5ed5817..ba623d5 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -231,9 +231,6 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const& config,
std::string flags;
const char* lang = language.c_str();
- this->LocalGenerator->AddLanguageStandardOptions(
- flags, this->GeneratorTarget, lang, config);
-
if (notKernel) {
this->LocalGenerator->AddLanguageFlags(flags, lang, config);
} else {
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index de716e6..8627cf2 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1643,8 +1643,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
li != languages.end(); ++li) {
std::string const& lang = *li;
std::string& flags = cflags[lang];
- this->CurrentLocalGenerator->AddLanguageStandardOptions(flags, gtgt, lang,
- configName);
// Add language-specific flags.
this->CurrentLocalGenerator->AddLanguageFlags(flags, lang, configName);
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6e4eeeb..44c390c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -746,13 +746,6 @@ void cmLocalGenerator::AddCompileOptions(std::string& flags,
this->AppendFlagEscape(flags, *i);
}
}
-}
-
-void cmLocalGenerator::AddLanguageStandardOptions(std::string& flags,
- cmGeneratorTarget* target,
- const std::string& lang,
- const std::string& config)
-{
std::vector<std::string> features;
target->GetCompileFeatures(features, config);
for (std::vector<std::string>::const_iterator it = features.begin();
@@ -1060,8 +1053,6 @@ void cmLocalGenerator::GetTargetCompileFlags(cmGeneratorTarget* target,
{
cmMakefile* mf = this->GetMakefile();
- this->AddLanguageStandardOptions(flags, target, lang, config);
-
// Add language-specific flags.
this->AddLanguageFlags(flags, lang, config);
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 689ec70..901ca35 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -98,10 +98,6 @@ public:
const std::string& lang,
const std::string& config);
- void AddLanguageStandardOptions(std::string& flags,
- cmGeneratorTarget* target,
- const std::string& lang,
- const std::string& config);
void AddLanguageFlags(std::string& flags, const std::string& lang,
const std::string& config);
void AddCMP0018Flags(std::string& flags, cmGeneratorTarget const* target,
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 04ec110..38dda04 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -648,7 +648,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(
target->GetName().c_str());
return;
}
- this->AddLanguageStandardOptions(flags, target, linkLanguage, configName);
if (linkLanguage == "C" || linkLanguage == "CXX" ||
linkLanguage == "Fortran") {
std::string baseFlagVar = "CMAKE_";
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1317c57..2e6c19b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2158,8 +2158,6 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
this->Name.c_str());
return false;
}
- this->LocalGenerator->AddLanguageStandardOptions(
- flags, this->GeneratorTarget, linkLanguage, configName);
if (linkLanguage == "C" || linkLanguage == "CXX" ||
linkLanguage == "Fortran" || linkLanguage == "CSharp") {
std::string baseFlagVar = "CMAKE_";
-----------------------------------------------------------------------
Summary of changes:
Source/cmGhsMultiTargetGenerator.cxx | 3 ---
Source/cmGlobalXCodeGenerator.cxx | 2 --
Source/cmLocalGenerator.cxx | 9 ---------
Source/cmLocalGenerator.h | 4 ----
Source/cmLocalVisualStudio7Generator.cxx | 1 -
Source/cmVisualStudio10TargetGenerator.cxx | 2 --
6 files changed, 21 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list