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, master has been updated
via 011693867ac0ee81912cca8e2289b9c584ccfb9b (commit)
via 1257fc91ff63f58692033ee16061aa35a51dc735 (commit)
via 842605341a6d1c3ca4fe4650f0f1572631cfc6a5 (commit)
via c921ec6112961304824b6bbdf7fb743f676325d0 (commit)
via cad199d4b290af947bae0075da37cfb3a66eafdd (commit)
via 786954c4893565d8da27329201fd235e347e051d (commit)
via 3c0428906a3e207ee41d2cce63459d61e23803c7 (commit)
via 4909594abdb768b89c7fb30d0693df7f05c54465 (commit)
via c104c3eec2184426b4e83420d25be207cdec90f5 (commit)
via a0212382c98c9e76190892ba76441ed2668ec6ba (commit)
via 444461c97c8eb23d338cc96674a961b27217ba18 (commit)
via 314c9c143dac4af1516f7f389e688d0d41d8d369 (commit)
via e42c018642b953cc6dbfe4e9ccb4639e7f1e6f1a (commit)
via a1216139f800a403fa04478a79162d2ca0c6a2f8 (commit)
via 81566557d591bf375384ca3e697877ba67c2f77d (commit)
via fe54989fcdd03a1f9bd674b31bac3a95a52a0fd5 (commit)
via a27a1c7e881f9381c38a7f17fa29fc537a274c9a (commit)
via 64843b17375c6ffd8b46ddaa9272e3ad27b6adec (commit)
from e49d85ae4b5397ec33bcfc6bc7984fedd7dcff11 (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=011693867ac0ee81912cca8e2289b9c584ccfb9b
commit 011693867ac0ee81912cca8e2289b9c584ccfb9b
Merge: 1257fc91ff 842605341a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:43:59 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:44:09 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1257fc91ff63f58692033ee16061aa35a51dc735
commit 1257fc91ff63f58692033ee16061aa35a51dc735
Merge: cad199d4b2 c921ec6112
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:43:59 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:44:08 2019 -0500
Merge topic 'FindwxWidgets-mingw'
c921ec6112 FindwxWidgets: Add link dependencies for MinGW
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4040
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad199d4b290af947bae0075da37cfb3a66eafdd
commit cad199d4b290af947bae0075da37cfb3a66eafdd
Merge: 3c0428906a 64843b1737
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:41:53 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:42:02 2019 -0500
Merge topic 'tag-std-string'
64843b1737 cmVisualStudio10TargetGenerator: use std::string for tag
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4026
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c0428906a3e207ee41d2cce63459d61e23803c7
commit 3c0428906a3e207ee41d2cce63459d61e23803c7
Merge: 4909594abd 786954c489
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:38:31 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:40:47 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4909594abdb768b89c7fb30d0693df7f05c54465
commit 4909594abdb768b89c7fb30d0693df7f05c54465
Merge: c104c3eec2 81566557d5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:38:31 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:40:47 2019 -0500
Merge topic 'objc-standard'
81566557d5 ObjC: Initialize ObjC/XX standard properties from C/C++
counterparts
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4022
diff --cc Source/cmLocalGenerator.cxx
index f8d43181ff,5f8b92089a..f2bf0796d8
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@@ -693,9 -693,19 +693,19 @@@ bool cmLocalGenerator::ComputeTargetCom
configNames.emplace_back();
}
+ using LanguagePair = std::pair<std::string, std::string>;
+ std::vector<LanguagePair> pairedLanguages{ { "OBJC", "C" },
+ { "OBJCXX", "CXX" } };
+ std::set<LanguagePair> objcEnabledLanguages;
+ for (auto const& lang : pairedLanguages) {
+ if (this->Makefile->GetState()->GetLanguageEnabled(lang.first)) {
+ objcEnabledLanguages.insert(lang);
+ }
+ }
+
// Process compile features of all targets.
- const std::vector<cmGeneratorTarget*>& targets =
this->GetGeneratorTargets();
- for (cmGeneratorTarget* target : targets) {
+ const auto& targets = this->GetGeneratorTargets();
+ for (const auto& target : targets) {
for (std::string const& c : configNames) {
if (!target->ComputeCompileFeatures(c)) {
return false;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c104c3eec2184426b4e83420d25be207cdec90f5
commit c104c3eec2184426b4e83420d25be207cdec90f5
Merge: 444461c97c a0212382c9
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:38:00 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:38:49 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=444461c97c8eb23d338cc96674a961b27217ba18
commit 444461c97c8eb23d338cc96674a961b27217ba18
Merge: 314c9c143d fe54989fcd
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:38:00 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:38:48 2019 -0500
Merge topic 'FindwxWidgets-qt'
fe54989fcd FindwxWidgets: Add support for wxQt
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4038
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=314c9c143dac4af1516f7f389e688d0d41d8d369
commit 314c9c143dac4af1516f7f389e688d0d41d8d369
Merge: e42c018642 a1216139f8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:37:31 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:37:43 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e42c018642b953cc6dbfe4e9ccb4639e7f1e6f1a
commit e42c018642b953cc6dbfe4e9ccb4639e7f1e6f1a
Merge: e49d85ae4b a27a1c7e88
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 14:37:31 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Nov 13 09:37:43 2019 -0500
Merge topic 'swift-rpath-separator'
a27a1c7e88 Swift: Allow build and installed RPATHs to differ
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4037
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64843b17375c6ffd8b46ddaa9272e3ad27b6adec
commit 64843b17375c6ffd8b46ddaa9272e3ad27b6adec
Author: Vitaly Stakhovsky <vvs31...@gitlab.org>
AuthorDate: Sun Nov 10 09:29:27 2019 -0500
Commit: Vitaly Stakhovsky <vvs31...@gitlab.org>
CommitDate: Sun Nov 10 09:29:27 2019 -0500
cmVisualStudio10TargetGenerator: use std::string for tag
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index fd346df685..73fbf8f75e 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2053,7 +2053,7 @@ std::string
cmLocalVisualStudio7Generator::ConvertToXMLOutputPathSingle(
}
void cmVS7GeneratorOptions::OutputFlag(std::ostream& fout, int indent,
- const char* flag,
+ const std::string& flag,
const std::string& content)
{
fout.fill('\t');
diff --git a/Source/cmLocalVisualStudio7Generator.h
b/Source/cmLocalVisualStudio7Generator.h
index 671783fa53..22a5f9ab4b 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -30,7 +30,7 @@ public:
: cmVisualStudioGeneratorOptions(lg, tool, table, extraTable)
{
}
- void OutputFlag(std::ostream& fout, int indent, const char* tag,
+ void OutputFlag(std::ostream& fout, int indent, const std::string& tag,
const std::string& content) override;
};
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index dac86a182b..a36afae8ba 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -52,7 +52,7 @@ struct cmVisualStudio10TargetGenerator::Elem
bool HasContent = false;
std::string Tag;
- Elem(std::ostream& s, const char* tag)
+ Elem(std::ostream& s, const std::string& tag)
: S(s)
, Indent(0)
, Tag(tag)
@@ -60,7 +60,7 @@ struct cmVisualStudio10TargetGenerator::Elem
this->StartElement();
}
Elem(const Elem&) = delete;
- Elem(Elem& par, const char* tag)
+ Elem(Elem& par, const std::string& tag)
: S(par.S)
, Indent(par.Indent + 1)
, Tag(tag)
@@ -77,7 +77,7 @@ struct cmVisualStudio10TargetGenerator::Elem
}
std::ostream& WriteString(const char* line);
void StartElement() { this->WriteString("<") << this->Tag; }
- void Element(const char* tag, const std::string& val)
+ void Element(const std::string& tag, const std::string& val)
{
Elem(*this, tag).Content(val);
}
@@ -115,7 +115,7 @@ struct cmVisualStudio10TargetGenerator::Elem
}
}
- void WritePlatformConfigTag(const char* tag, const std::string& cond,
+ void WritePlatformConfigTag(const std::string& tag, const std::string& cond,
const std::string& content);
};
@@ -131,8 +131,8 @@ public:
{
}
- void OutputFlag(std::ostream& /*fout*/, int /*indent*/, const char* tag,
- const std::string& content) override
+ void OutputFlag(std::ostream& /*fout*/, int /*indent*/,
+ const std::string& tag, const std::string& content) override
{
if (!this->GetConfiguration().empty()) {
// if there are configuration specific flags, then
@@ -274,7 +274,7 @@ std::string cmVisualStudio10TargetGenerator::CalcCondition(
}
void cmVisualStudio10TargetGenerator::Elem::WritePlatformConfigTag(
- const char* tag, const std::string& cond, const std::string& content)
+ const std::string& tag, const std::string& cond, const std::string& content)
{
Elem(*this, tag).Attribute("Condition", cond).Content(content);
}
@@ -562,7 +562,7 @@ void cmVisualStudio10TargetGenerator::Generate()
const char* value = this->GeneratorTarget->GetProperty(keyIt);
if (!value)
continue;
- e1.Element(globalKey.c_str(), value);
+ e1.Element(globalKey, value);
}
if (this->Managed) {
@@ -913,7 +913,7 @@ void
cmVisualStudio10TargetGenerator::WriteDotNetReferenceCustomTags(
}
}
for (auto const& tag : tags) {
- e2.Element(tag.first.c_str(), tag.second);
+ e2.Element(tag.first, tag.second);
}
}
@@ -1019,7 +1019,7 @@ void
cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup(Elem& e0)
if (!tagName.empty()) {
std::string value = props.GetPropertyValue(p);
if (!value.empty()) {
- e2.Element(tagName.c_str(), value);
+ e2.Element(tagName, value);
}
}
}
@@ -1751,7 +1751,7 @@ void cmVisualStudio10TargetGenerator::WriteGroupSources(
std::string const& filter = sourceGroup->GetFullName();
std::string path = this->ConvertPath(source, s.RelativePath);
ConvertToWindowsSlash(path);
- Elem e2(e1, name.c_str());
+ Elem e2(e1, name);
e2.Attribute("Include", path);
if (!filter.empty()) {
e2.Element("Filter", filter);
@@ -2637,9 +2637,9 @@ void
cmVisualStudio10TargetGenerator::OutputLinkIncremental(
// Some link options belong here. Use them now and remove them so that
// WriteLinkOptions does not use them.
- const char* flags[] = { "LinkDelaySign", "LinkKeyFile", 0 };
- for (const char** f = flags; *f; ++f) {
- const char* flag = *f;
+ static const std::vector<std::string> flags{ "LinkDelaySign",
+ "LinkKeyFile" };
+ for (const std::string& flag : flags) {
if (const char* value = linkOptions.GetFlag(flag)) {
e1.WritePlatformConfigTag(flag, cond, value);
linkOptions.RemoveFlag(flag);
@@ -4040,8 +4040,8 @@ void cmVisualStudio10TargetGenerator::WriteEvents(
}
void cmVisualStudio10TargetGenerator::WriteEvent(
- Elem& e1, const char* name, std::vector<cmCustomCommand> const& commands,
- std::string const& configName)
+ Elem& e1, const std::string& name,
+ std::vector<cmCustomCommand> const& commands, std::string const& configName)
{
if (commands.empty()) {
return;
@@ -4860,7 +4860,7 @@ void
cmVisualStudio10TargetGenerator::WriteCSharpSourceProperties(
Elem& e2, const std::map<std::string, std::string>& tags)
{
for (const auto& i : tags) {
- e2.Element(i.first.c_str(), i.second);
+ e2.Element(i.first, i.second);
}
}
diff --git a/Source/cmVisualStudio10TargetGenerator.h
b/Source/cmVisualStudio10TargetGenerator.h
index 0835cde9f7..30027c9e72 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -165,7 +165,7 @@ private:
void WriteLibOptions(Elem& e1, std::string const& config);
void WriteManifestOptions(Elem& e1, std::string const& config);
void WriteEvents(Elem& e1, std::string const& configName);
- void WriteEvent(Elem& e1, const char* name,
+ void WriteEvent(Elem& e1, std::string const& name,
std::vector<cmCustomCommand> const& commands,
std::string const& configName);
void WriteGroupSources(Elem& e0, std::string const& name,
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx
b/Source/cmVisualStudioGeneratorOptions.cxx
index 1139aa9745..18c19b7d69 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -431,7 +431,7 @@ void
cmVisualStudioGeneratorOptions::OutputPreprocessorDefinitions(
if (this->Defines.empty()) {
return;
}
- const char* tag = "PreprocessorDefinitions";
+ std::string tag = "PreprocessorDefinitions";
if (lang == "CUDA") {
tag = "Defines";
}
@@ -473,7 +473,7 @@ void
cmVisualStudioGeneratorOptions::OutputAdditionalIncludeDirectories(
return;
}
- const char* tag = "AdditionalIncludeDirectories";
+ std::string tag = "AdditionalIncludeDirectories";
if (lang == "CUDA") {
tag = "Include";
} else if (lang == "ASM_MASM" || lang == "ASM_NASM") {
@@ -528,6 +528,6 @@ void
cmVisualStudioGeneratorOptions::OutputFlagMap(std::ostream& fout,
sep = ";";
}
- this->OutputFlag(fout, indent, m.first.c_str(), oss.str());
+ this->OutputFlag(fout, indent, m.first, oss.str());
}
}
diff --git a/Source/cmVisualStudioGeneratorOptions.h
b/Source/cmVisualStudioGeneratorOptions.h
index 560593e011..d8dcfe2d22 100644
--- a/Source/cmVisualStudioGeneratorOptions.h
+++ b/Source/cmVisualStudioGeneratorOptions.h
@@ -86,7 +86,8 @@ public:
const std::string& GetConfiguration() const;
protected:
- virtual void OutputFlag(std::ostream& fout, int indent, const char* tag,
+ virtual void OutputFlag(std::ostream& fout, int indent,
+ const std::string& tag,
const std::string& content) = 0;
private:
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeSwiftInformation.cmake | 1 +
Modules/FindwxWidgets.cmake | 50 ++++++++++++++++--------------
Source/cmLocalGenerator.cxx | 29 +++++++++++++++++
Source/cmLocalVisualStudio7Generator.cxx | 2 +-
Source/cmLocalVisualStudio7Generator.h | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 34 ++++++++++----------
Source/cmVisualStudio10TargetGenerator.h | 2 +-
Source/cmVisualStudioGeneratorOptions.cxx | 6 ++--
Source/cmVisualStudioGeneratorOptions.h | 3 +-
9 files changed, 82 insertions(+), 47 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
