[Cmake-commits] CMake branch, master, updated. v3.14.3-938-ge0ab9e1
Kitware Robot
kwrobot at kitware.com
Tue May 14 10:53:08 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 e0ab9e1cb9b07a1a320db6a788442cd9bc2a98c6 (commit)
via 9ca45a51ae5ee511988728a84764e1b9eacf8f51 (commit)
via b0b357a878712d1125744d0afc7389239ec1def2 (commit)
via 7d9db24f4c1eb68687bf66002577781d01684478 (commit)
via 016a8bc6593a0015b3082e152f1f5277b03cd7bd (commit)
via 65c5c1b567bdeb4c33ac2f6ad92786c159edf82a (commit)
via 620e7b1c39848ab0c37ac643a9f1595fc1e0ba97 (commit)
via e9d128b789f91c3f8d22e366500f58e6c7f6abc6 (commit)
via 9523ca72e29350b66c37e60f9db6a8025f67cad1 (commit)
from 9d48d3f61b25400a191f12ea92b8e5496ab47a8f (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=e0ab9e1cb9b07a1a320db6a788442cd9bc2a98c6
commit e0ab9e1cb9b07a1a320db6a788442cd9bc2a98c6
Merge: 9ca45a5 9523ca7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 14 14:51:49 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 14 10:52:17 2019 -0400
Merge topic 'apple_clang_cxx_20_support'
9523ca72e2 Features: Activate C++20 support for AppleClang 10.0+
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3294
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ca45a51ae5ee511988728a84764e1b9eacf8f51
commit 9ca45a51ae5ee511988728a84764e1b9eacf8f51
Merge: b0b357a 016a8bc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 14 10:51:23 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 14 10:51:23 2019 -0400
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0b357a878712d1125744d0afc7389239ec1def2
commit b0b357a878712d1125744d0afc7389239ec1def2
Merge: 7d9db24 65c5c1b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 14 14:48:10 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 14 10:49:30 2019 -0400
Merge topic 'swig4'
65c5c1b567 FindSWIG: Support swig4.0
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3314
diff --cc Modules/FindSWIG.cmake
index a5e3a37,96b254f..ae6ae56
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@@ -19,14 -19,14 +19,14 @@@ This module finds an installed SWIG. I
The minimum required version of SWIG can be specified using the
-standard syntax, e.g. find_package(SWIG 1.1)
+standard syntax, e.g. :command:`find_package(SWIG 1.1)`
-All information is collected from the SWIG_EXECUTABLE so the version
+All information is collected from the ``SWIG_EXECUTABLE``, so the version
to be found can be changed from the command line by means of setting
-SWIG_EXECUTABLE
+``SWIG_EXECUTABLE``
#]=======================================================================]
- find_program(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig)
+ find_program(SWIG_EXECUTABLE NAMES swig4.0 swig3.0 swig2.0 swig)
if(SWIG_EXECUTABLE)
execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d9db24f4c1eb68687bf66002577781d01684478
commit 7d9db24f4c1eb68687bf66002577781d01684478
Merge: 9d48d3f e9d128b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 14 14:48:04 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 14 10:48:13 2019 -0400
Merge topic 'ios-xctest-lookup'
e9d128b789 Apple: Properly lookup XCTest for iOS and tvOS
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3309
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9523ca72e29350b66c37e60f9db6a8025f67cad1
commit 9523ca72e29350b66c37e60f9db6a8025f67cad1
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue May 7 13:38:35 2019 -0400
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue May 7 16:24:08 2019 -0400
Features: Activate C++20 support for AppleClang 10.0+
diff --git a/Help/release/dev/apple-clang-supports-cxx20.rst b/Help/release/dev/apple-clang-supports-cxx20.rst
new file mode 100644
index 0000000..f19ee68
--- /dev/null
+++ b/Help/release/dev/apple-clang-supports-cxx20.rst
@@ -0,0 +1,4 @@
+apple-clang-supports-cxx20
+--------------------------
+
+* AppleClang compiler have learned how to compile C++20.
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 2042360..1eae50e 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -28,9 +28,13 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z")
endif()
-
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
endif()
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+ set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++2a")
+ set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++2a")
+endif()
+
__compiler_check_default_language_standard(CXX 4.0 98)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/apple-clang-supports-cxx20.rst | 4 ++++
Modules/Compiler/AppleClang-CXX.cmake | 6 +++++-
Modules/FindSWIG.cmake | 2 +-
Modules/FindXCTest.cmake | 19 +++++++++++++++++++
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 15 +++++++++++++++
Tests/RunCMake/XcodeProject/XCTestLookup.cmake | 3 +++
6 files changed, 47 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/apple-clang-supports-cxx20.rst
create mode 100644 Tests/RunCMake/XcodeProject/XCTestLookup.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list