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 b55f605e70f3186e6611f4f84dc246d39453af03 (commit)
via 4f71b55908739cc20fcb0370031d8c2a07ae6688 (commit)
via 9bc8854b3c1fe41baa5847f41ff4e4d08c2fda36 (commit)
via f8a1b07953e6bf40da7def8459f8327cb007d2a9 (commit)
via 6a818b693192e96f57c866caf2541669342a700b (commit)
via dc01c73f2d187d3a7e20527372f4e2888ffedc0a (commit)
via 78ce959a40c788356e304829d5f93742c5c83fa6 (commit)
from 10f8197400cf0be678444f7400c8739f63096c76 (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=b55f605e70f3186e6611f4f84dc246d39453af03
commit b55f605e70f3186e6611f4f84dc246d39453af03
Merge: 4f71b55908 dc01c73f2d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 15 14:15:22 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 15 09:15:29 2019 -0500
Merge topic 'update-kwsys'
dc01c73f2d Merge branch 'upstream-KWSys' into update-kwsys
78ce959a40 KWSys 2019-11-13 (e67ed8ef)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4047
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f71b55908739cc20fcb0370031d8c2a07ae6688
commit 4f71b55908739cc20fcb0370031d8c2a07ae6688
Merge: 9bc8854b3c f8a1b07953
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 15 14:04:19 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 15 09:06:07 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bc8854b3c1fe41baa5847f41ff4e4d08c2fda36
commit 9bc8854b3c1fe41baa5847f41ff4e4d08c2fda36
Merge: 10f8197400 6a818b6931
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 15 14:04:19 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 15 09:06:07 2019 -0500
Merge topic 'objc-standard-fix'
6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Robert Maynard <robert.mayn...@kitware.com>
Merge-request: !4050
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc01c73f2d187d3a7e20527372f4e2888ffedc0a
commit dc01c73f2d187d3a7e20527372f4e2888ffedc0a
Merge: 011693867a 78ce959a40
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Nov 13 09:48:23 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Nov 13 09:48:23 2019 -0500
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-11-13 (e67ed8ef)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78ce959a40c788356e304829d5f93742c5c83fa6
commit 78ce959a40c788356e304829d5f93742c5c83fa6
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Wed Nov 13 09:47:45 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Nov 13 09:48:22 2019 -0500
KWSys 2019-11-13 (e67ed8ef)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit e67ed8efaf193036a92b648eec2ea71fabc0c05a (master).
Upstream Shortlog
-----------------
Brad King (2):
b019deea RegularExpression: Suppress VS 2013 warning C4351
a5248df0 CTestCustom: Suppress PGI Community Edition compiler license
warnings
Paul Smith (1):
dfd0521e Terminal: Support GNU make's TTY notification environment
variable
Todd Martin (2):
0492cad3 SystemTools: Remove redundant ToWindowsExtendedPath calls
680ab6d2 FStream: Expose is_open publicly
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 760221b124..c07f0f30f8 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -12,3 +12,7 @@
list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE
kwsys.testProcess-10
)
+
+list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
+ "LICENSE WARNING"
+ )
diff --git a/FStream.hxx.in b/FStream.hxx.in
index d79bbdf16b..b424488920 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -87,7 +87,7 @@ public:
bool _open(char const* file_name, std::ios_base::openmode mode)
{
- if (is_open() || file_) {
+ if (_is_open() || file_) {
return false;
}
# if defined(_MSC_VER)
@@ -108,7 +108,7 @@ public:
return success;
}
- bool is_open()
+ bool _is_open()
{
if (!buf_) {
return false;
@@ -116,7 +116,7 @@ public:
return buf_->is_open();
}
- bool is_open() const
+ bool _is_open() const
{
if (!buf_) {
return false;
@@ -198,9 +198,11 @@ public:
this->_set_state(this->_open(file_name, mode), this, this);
}
+ bool is_open() { return this->_is_open(); }
+
void close() { this->_set_state(this->_close(), this, this); }
- using basic_efilebuf<CharType, Traits>::is_open;
+ using basic_efilebuf<CharType, Traits>::_is_open;
internal_buffer_type* rdbuf() const { return this->buf_; }
@@ -212,7 +214,7 @@ class basic_ofstream
: public std::basic_ostream<CharType, Traits>
, public basic_efilebuf<CharType, Traits>
{
- using basic_efilebuf<CharType, Traits>::is_open;
+ using basic_efilebuf<CharType, Traits>::_is_open;
public:
typedef typename basic_efilebuf<CharType, Traits>::internal_buffer_type
@@ -242,6 +244,8 @@ public:
void close() { this->_set_state(this->_close(), this, this); }
+ bool is_open() { return this->_is_open(); }
+
internal_buffer_type* rdbuf() const { return this->buf_; }
~basic_ofstream() @KWSYS_NAMESPACE@_FStream_NOEXCEPT { close(); }
diff --git a/RegularExpression.hxx.in b/RegularExpression.hxx.in
index 0c2366b842..d11db88280 100644
--- a/RegularExpression.hxx.in
+++ b/RegularExpression.hxx.in
@@ -66,6 +66,13 @@ private:
const char* searchstring;
};
+#ifdef _MSC_VER
+# pragma warning(push)
+# if _MSC_VER < 1900
+# pragma warning(disable : 4351) /* new behavior */
+# endif
+#endif
+
/**
* \brief Creates an invalid match object
*/
@@ -76,6 +83,10 @@ inline RegularExpressionMatch::RegularExpressionMatch()
{
}
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
/**
* \brief Returns true if the match pointers are valid
*/
diff --git a/SystemTools.cxx b/SystemTools.cxx
index ce4d6ef950..dcf05daa85 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2326,14 +2326,8 @@ bool SystemTools::TextFilesDiffer(const std::string&
path1,
static bool CopyFileContentBlockwise(const std::string& source,
const std::string& destination)
{
-// Open files
-#if defined(_WIN32)
- kwsys::ifstream fin(
- Encoding::ToNarrow(Encoding::ToWindowsExtendedPath(source)).c_str(),
- std::ios::in | std::ios::binary);
-#else
+ // Open files
kwsys::ifstream fin(source.c_str(), std::ios::in | std::ios::binary);
-#endif
if (!fin) {
return false;
}
@@ -2344,14 +2338,8 @@ static bool CopyFileContentBlockwise(const std::string&
source,
// that do not allow file removal can be modified.
SystemTools::RemoveFile(destination);
-#if defined(_WIN32)
- kwsys::ofstream fout(
- Encoding::ToNarrow(Encoding::ToWindowsExtendedPath(destination)).c_str(),
- std::ios::out | std::ios::trunc | std::ios::binary);
-#else
kwsys::ofstream fout(destination.c_str(),
std::ios::out | std::ios::trunc | std::ios::binary);
-#endif
if (!fout) {
return false;
}
diff --git a/Terminal.c b/Terminal.c
index 4dd246148c..c9515ee7d0 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -172,6 +172,14 @@ static int kwsysTerminalStreamIsVT100(FILE* stream, int
default_vt100,
}
}
+ /* GNU make 4.1+ may tell us that its output is destined for a TTY. */
+ {
+ const char* termout = getenv("MAKE_TERMOUT");
+ if (termout && *termout != '\0') {
+ return 1;
+ }
+ }
+
/* If running inside emacs the terminal is not VT100. Some emacs
seem to claim the TERM is xterm even though they do not support
VT100 escapes. */
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 43 +++++++++++++++++++++++------------
Source/kwsys/CTestCustom.cmake.in | 4 ++++
Source/kwsys/FStream.hxx.in | 14 ++++++++----
Source/kwsys/RegularExpression.hxx.in | 11 +++++++++
Source/kwsys/SystemTools.cxx | 14 +-----------
Source/kwsys/Terminal.c | 8 +++++++
6 files changed, 62 insertions(+), 32 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
