[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1887-g0bb5c25

Stephen Kelly steveire at gmail.com
Fri Apr 4 09:11:21 EDT 2014


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, next has been updated
       via  0bb5c2545b89ba234ee26304fcafcfa427efe048 (commit)
       via  3cc5a0cc1ce8ea331b27aed4ede25bfe2b9c4baf (commit)
      from  b494d7b38a304d281fac3572626c48f9d6a8b7f7 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bb5c2545b89ba234ee26304fcafcfa427efe048
commit 0bb5c2545b89ba234ee26304fcafcfa427efe048
Merge: b494d7b 3cc5a0c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 4 09:11:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 4 09:11:20 2014 -0400

    Merge topic 'cxx11-features' into next
    
    3cc5a0cc Features: Add cxx_variadic_macros.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cc5a0cc1ce8ea331b27aed4ede25bfe2b9c4baf
commit 3cc5a0cc1ce8ea331b27aed4ede25bfe2b9c4baf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 4 15:05:10 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 4 15:05:10 2014 +0200

    Features: Add cxx_variadic_macros.

diff --git a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
index c45f8ad..f70ed0f 100644
--- a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
+++ b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst
@@ -171,3 +171,8 @@ The features known to this version of CMake are:
   Uniform intialization, as defined in N2640_.
 
 .. _N2640: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2640.pdf
+
+``cxx_variadic_macros``
+  Variadic macros, as defined in N1653_.
+
+.. _N1653: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1653.htm
diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
index eaa40ce..65e5750 100644
--- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
@@ -45,4 +45,6 @@ set(GNU43_CXX11 "${_oldestSupported} && __cplusplus >= 201103L")
 set(_cmake_feature_test_cxx_static_assert "${GNU43_CXX11}")
 set(_cmake_feature_test_cxx_decltype "${GNU43_CXX11}")
 set(_cmake_feature_test_cxx_rvalue_references "${GNU43_CXX11}")
+# TODO: Should be supported forever?
+set(_cmake_feature_test_cxx_variadic_macros "${_oldestSupported}")
 set(_oldestSupported)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 5b0a8f6..27f4c2e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -73,7 +73,8 @@
   F(cxx_alignof) \
   F(cxx_attributes) \
   F(cxx_generalized_initializers) \
-  F(cxx_uniform_initialization)
+  F(cxx_uniform_initialization) \
+  F(cxx_variadic_macros)
 
 class cmMakefile::Internals
 {
diff --git a/Tests/CompileFeatures/cxx_variadic_macros.cpp b/Tests/CompileFeatures/cxx_variadic_macros.cpp
new file mode 100644
index 0000000..2b8d0a4
--- /dev/null
+++ b/Tests/CompileFeatures/cxx_variadic_macros.cpp
@@ -0,0 +1,12 @@
+
+int someFunc(int, char, int)
+{
+
+}
+
+#define FUNC_WRAPPER(...) someFunc(__VA_ARGS__)
+
+void otherFunc()
+{
+  FUNC_WRAPPER(42, 'a', 7);
+}

-----------------------------------------------------------------------

Summary of changes:
 Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst    |    5 +++++
 Modules/Compiler/GNU-CXX-FeatureTests.cmake   |    2 ++
 Source/cmMakefile.cxx                         |    3 ++-
 Tests/CompileFeatures/cxx_variadic_macros.cpp |   12 ++++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 Tests/CompileFeatures/cxx_variadic_macros.cpp


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list