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 160735c479535f0137c7b9a14edeccb623473f74 (commit)
via f2dc10d55c24d1714d65ce990a8e7658d92d2e14 (commit)
via 3c9c91a360104b97aa6ad27934ff7603c862a2f7 (commit)
via 30faf7262561da45a79af5de9c77531091dac6b9 (commit)
via f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf (commit)
via a930de85d88891b2516c60306bb49cc85d38c5a8 (commit)
via 157570b5a2d3135e2d83f9bd2865ad666a709499 (commit)
from 442cb77bf31c02f83c47167ef9842b7756029227 (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=160735c479535f0137c7b9a14edeccb623473f74
commit 160735c479535f0137c7b9a14edeccb623473f74
Merge: f2dc10d 30faf72
Author: Kyle Edwards <kyle.edwa...@kitware.com>
AuthorDate: Fri Feb 15 15:02:02 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Feb 15 10:02:10 2019 -0500
Merge topic 'remove_return_void'
30faf72625 Remove return from void function
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2969
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2dc10d55c24d1714d65ce990a8e7658d92d2e14
commit f2dc10d55c24d1714d65ce990a8e7658d92d2e14
Merge: 3c9c91a 157570b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 15 14:59:44 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Feb 15 10:00:21 2019 -0500
Merge topic 'ninja-swift-library-name'
157570b5a2 Add placeholder for Swift's library name
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2902
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c9c91a360104b97aa6ad27934ff7603c862a2f7
commit 3c9c91a360104b97aa6ad27934ff7603c862a2f7
Merge: 442cb77 f510aaf
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 15 14:59:32 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Feb 15 09:59:40 2019 -0500
Merge topic 'update-kwsys'
f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys
a930de85d8 KWSys 2019-02-14 (e270ce9f)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2967
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30faf7262561da45a79af5de9c77531091dac6b9
commit 30faf7262561da45a79af5de9c77531091dac6b9
Author: Albert Astals Cid <albert.astals....@kdab.com>
AuthorDate: Thu Feb 14 17:34:06 2019 +0100
Commit: Albert Astals Cid <albert.astals....@kdab.com>
CommitDate: Thu Feb 14 17:34:06 2019 +0100
Remove return from void function
diff --git a/Source/cmQtAutoGeneratorMocUic.cxx
b/Source/cmQtAutoGeneratorMocUic.cxx
index ddff4cf..2959b7d 100644
--- a/Source/cmQtAutoGeneratorMocUic.cxx
+++ b/Source/cmQtAutoGeneratorMocUic.cxx
@@ -1020,20 +1020,20 @@ cmQtAutoGeneratorMocUic::WorkerT::~WorkerT()
void cmQtAutoGeneratorMocUic::WorkerT::LogInfo(
GeneratorT genType, std::string const& message) const
{
- return Log().Info(genType, message);
+ Log().Info(genType, message);
}
void cmQtAutoGeneratorMocUic::WorkerT::LogWarning(
GeneratorT genType, std::string const& message) const
{
- return Log().Warning(genType, message);
+ Log().Warning(genType, message);
}
void cmQtAutoGeneratorMocUic::WorkerT::LogFileWarning(
GeneratorT genType, std::string const& filename,
std::string const& message) const
{
- return Log().WarningFile(genType, filename, message);
+ Log().WarningFile(genType, filename, message);
}
void cmQtAutoGeneratorMocUic::WorkerT::LogError(
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf
commit f510aafbfc33d3bfd6ba919a17f608c7bb85cfcf
Merge: e3353a0 a930de8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 14 10:55:44 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Feb 14 10:55:44 2019 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-02-14 (e270ce9f)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a930de85d88891b2516c60306bb49cc85d38c5a8
commit a930de85d88891b2516c60306bb49cc85d38c5a8
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Thu Feb 14 10:13:42 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Feb 14 10:55:44 2019 -0500
KWSys 2019-02-14 (e270ce9f)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit e270ce9fc60971006e934e9d53d11be5f85efc39 (master).
Upstream Shortlog
-----------------
Albert Astals Cid (2):
95ced423 hashtable: delete assignment operator instead of poisoning it
6090d36b Glob: Use the default copy constructor and assignment
operator
diff --git a/Glob.hxx.in b/Glob.hxx.in
index bd4a176..4c3bde1 100644
--- a/Glob.hxx.in
+++ b/Glob.hxx.in
@@ -41,17 +41,9 @@ public:
, content(c)
{
}
- Message(const Message& msg)
- : type(msg.type)
- , content(msg.content)
- {
- }
- Message& operator=(Message const& msg)
- {
- this->type = msg.type;
- this->content = msg.content;
- return *this;
- }
+ ~Message() = default;
+ Message(const Message& msg) = default;
+ Message& operator=(Message const& msg) = default;
};
typedef std::vector<Message> GlobMessages;
diff --git a/hashtable.hxx.in b/hashtable.hxx.in
index fc0d60e..0981c66 100644
--- a/hashtable.hxx.in
+++ b/hashtable.hxx.in
@@ -73,7 +73,7 @@ struct _Hashtable_node
void public_method_to_quiet_warning_about_all_methods_private();
private:
- void operator=(_Hashtable_node<_Val> const&); // poison node assignment
+ void operator=(_Hashtable_node<_Val> const&) = delete;
};
template <class _Val, class _Key, class _HashFcn, class _ExtractKey,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=157570b5a2d3135e2d83f9bd2865ad666a709499
commit 157570b5a2d3135e2d83f9bd2865ad666a709499
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Thu Jan 31 15:39:44 2019 -0800
Commit: Saleem Abdulrasool <compn...@compnerd.org>
CommitDate: Wed Feb 13 09:25:29 2019 -0800
Add placeholder for Swift's library name
This allows us to set the proper link name for the Swift library
(soname). Because this needs to be passed to the object being compiled,
we need to create a new placeholder so that it can be sent along to the
frontend. Default to the target name unless it is explicitly provided.
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index b525dac..df6428f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -454,6 +454,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const
std::string& lang)
if (lang == "Swift") {
vars.SwiftAuxiliarySources = "$SWIFT_AUXILIARY_SOURCES";
vars.SwiftModuleName = "$SWIFT_MODULE_NAME";
+ vars.SwiftLibraryName = "$SWIFT_LIBRARY_NAME";
}
// For some cases we do an explicit preprocessor invocation.
@@ -940,6 +941,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
} else {
vars["SWIFT_MODULE_NAME"] = this->GeneratorTarget->GetName();
}
+
+ cmGeneratorTarget::Names targetNames =
+ this->GeneratorTarget->GetLibraryNames(this->GetConfigName());
+ vars["SWIFT_LIBRARY_NAME"] = targetNames.Base;
}
if (!this->NeedDepTypeMSVC(language)) {
diff --git a/Source/cmRulePlaceholderExpander.cxx
b/Source/cmRulePlaceholderExpander.cxx
index e347a2c..5ebdd1b 100644
--- a/Source/cmRulePlaceholderExpander.cxx
+++ b/Source/cmRulePlaceholderExpander.cxx
@@ -172,6 +172,11 @@ std::string cmRulePlaceholderExpander::ExpandRuleVariable(
return replaceValues.SwiftModuleName;
}
}
+ if (replaceValues.SwiftLibraryName) {
+ if (variable == "SWIFT_LIBRARY_NAME") {
+ return replaceValues.SwiftLibraryName;
+ }
+ }
if (variable == "TARGET_SONAME" || variable == "SONAME_FLAG" ||
variable == "TARGET_INSTALLNAME_DIR") {
// All these variables depend on TargetSOName
diff --git a/Source/cmRulePlaceholderExpander.h
b/Source/cmRulePlaceholderExpander.h
index 5c03637..930eafd 100644
--- a/Source/cmRulePlaceholderExpander.h
+++ b/Source/cmRulePlaceholderExpander.h
@@ -60,6 +60,7 @@ public:
const char* FilterPrefix;
const char* SwiftAuxiliarySources;
const char* SwiftModuleName;
+ const char* SwiftLibraryName;
};
// Expand rule variables in CMake of the type found in language rules
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaTargetGenerator.cxx | 5 +++++
Source/cmQtAutoGeneratorMocUic.cxx | 6 +++---
Source/cmRulePlaceholderExpander.cxx | 5 +++++
Source/cmRulePlaceholderExpander.h | 1 +
Source/kwsys/Glob.hxx.in | 14 +++-----------
Source/kwsys/hashtable.hxx.in | 2 +-
6 files changed, 18 insertions(+), 15 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
