[Cmake-commits] CMake branch, master, updated. v3.15.0-413-g4cd039b
Kitware Robot
kwrobot at kitware.com
Mon Jul 22 09:13:04 EDT 2019
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 4cd039b78a955972a9c2b3947f267ce4b93489a0 (commit)
via 9dfb66372ee398a9587364c42ed9c54cc226ced9 (commit)
from dbffd2f4d5742374a96468d217490769d1fad288 (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=4cd039b78a955972a9c2b3947f267ce4b93489a0
commit 4cd039b78a955972a9c2b3947f267ce4b93489a0
Merge: dbffd2f 9dfb663
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 22 13:04:02 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 22 09:04:11 2019 -0400
Merge topic 'bootstrap-c++14'
9dfb66372e bootstrap: Verify C++14 capabilities before using them
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3587
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dfb66372ee398a9587364c42ed9c54cc226ced9
commit 9dfb66372ee398a9587364c42ed9c54cc226ced9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 15 07:58:18 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 18 11:10:12 2019 -0400
bootstrap: Verify C++14 capabilities before using them
In commit a605bf438e (Extend C++17/C++14 feature checks to cover more
standard library APIs, 2019-02-27, cpp-modules-20190312.1~52^2~1) we
added checks to the main build of CMake to verify C++14 capabilities
before using C++14 flags to build. Add these to the bootstrap check
too.
diff --git a/bootstrap b/bootstrap
index c2194fe..41431cc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1125,6 +1125,25 @@ echo '
#error "SunPro <= 5.13 mode not supported due to bug in move semantics."
#endif
+#if __cplusplus > 201103L
+#include <iterator>
+int check_cxx14()
+{
+ int a[] = { 0, 1, 2 };
+ auto ai = std::cbegin(a);
+
+ int b[] = { 2, 1, 0 };
+ auto bi = std::cend(b);
+
+ return *ai + *(bi - 1);
+}
+#else
+int check_cxx14()
+{
+ return 0;
+}
+#endif
+
class Class
{
public:
@@ -1135,7 +1154,7 @@ private:
int main()
{
auto const c = std::unique_ptr<Class>(new Class);
- std::cout << c->Get() << std::endl;
+ std::cout << c->Get() << check_cxx14() << std::endl;
return 0;
}
' > "${TMPFILE}.cxx"
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list