[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3652-g5fa4589
Rolf Eike Beer
eike at sf-mail.de
Sun Aug 4 13:41:06 EDT 2013
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 5fa45896bd1e8f1b8300e352a5ba34d816ddba08 (commit)
via aa39f87012d6d5b99e892a22cd0a8cf964ca0697 (commit)
via 5ce08b5245673aa9e401ca561a43bd1853736d2c (commit)
from e9382a2c75f1281ee9c80f7388a4f098dceb5ace (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=5fa45896bd1e8f1b8300e352a5ba34d816ddba08
commit 5fa45896bd1e8f1b8300e352a5ba34d816ddba08
Merge: e9382a2 aa39f87
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 4 13:41:00 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 4 13:41:00 2013 -0400
Merge topic 'cxx11' into next
aa39f87 CXXFeatures: remove "test-" from filenames
5ce08b5 CXXFeatures: add test for delegating constructors
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa39f87012d6d5b99e892a22cd0a8cf964ca0697
commit aa39f87012d6d5b99e892a22cd0a8cf964ca0697
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 4 19:40:01 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Aug 4 19:40:01 2013 +0200
CXXFeatures: remove "test-" from filenames
diff --git a/Modules/FindCXXFeatures.cmake b/Modules/FindCXXFeatures.cmake
index c74db88..6b35291 100644
--- a/Modules/FindCXXFeatures.cmake
+++ b/Modules/FindCXXFeatures.cmake
@@ -70,7 +70,7 @@ function(cxx_check_feature FEATURE_NAME)
set(_bindir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${FEATURE_NAME}")
- set(_SRCFILE_BASE ${CMAKE_CURRENT_LIST_DIR}/FindCXXFeatures/cxx11-test-${FEATURE_NAME})
+ set(_SRCFILE_BASE ${CMAKE_CURRENT_LIST_DIR}/FindCXXFeatures/cxx11-${FEATURE_NAME})
set(_LOG_NAME "\"${FEATURE_NAME}\"")
message(STATUS "Checking C++ support for ${_LOG_NAME}")
diff --git a/Modules/FindCXXFeatures/cxx11-test-auto.cxx b/Modules/FindCXXFeatures/cxx11-auto.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-auto.cxx
rename to Modules/FindCXXFeatures/cxx11-auto.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-auto_fail_compile.cxx b/Modules/FindCXXFeatures/cxx11-auto_fail_compile.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-auto_fail_compile.cxx
rename to Modules/FindCXXFeatures/cxx11-auto_fail_compile.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-class_override_final.cxx b/Modules/FindCXXFeatures/cxx11-class_override_final.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-class_override_final.cxx
rename to Modules/FindCXXFeatures/cxx11-class_override_final.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-class_override_final_fail_compile.cxx b/Modules/FindCXXFeatures/cxx11-class_override_final_fail_compile.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-class_override_final_fail_compile.cxx
rename to Modules/FindCXXFeatures/cxx11-class_override_final_fail_compile.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-constexpr.cxx b/Modules/FindCXXFeatures/cxx11-constexpr.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-constexpr.cxx
rename to Modules/FindCXXFeatures/cxx11-constexpr.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-cstdint_header.cxx b/Modules/FindCXXFeatures/cxx11-cstdint_header.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-cstdint_header.cxx
rename to Modules/FindCXXFeatures/cxx11-cstdint_header.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-decltype.cxx b/Modules/FindCXXFeatures/cxx11-decltype.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-decltype.cxx
rename to Modules/FindCXXFeatures/cxx11-decltype.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-defaulted_functions.cxx b/Modules/FindCXXFeatures/cxx11-defaulted_functions.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-defaulted_functions.cxx
rename to Modules/FindCXXFeatures/cxx11-defaulted_functions.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-delegating_constructors.cxx b/Modules/FindCXXFeatures/cxx11-delegating_constructors.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-delegating_constructors.cxx
rename to Modules/FindCXXFeatures/cxx11-delegating_constructors.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-deleted_functions.cxx b/Modules/FindCXXFeatures/cxx11-deleted_functions.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-deleted_functions.cxx
rename to Modules/FindCXXFeatures/cxx11-deleted_functions.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-deleted_functions_fail_compile.cxx b/Modules/FindCXXFeatures/cxx11-deleted_functions_fail_compile.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-deleted_functions_fail_compile.cxx
rename to Modules/FindCXXFeatures/cxx11-deleted_functions_fail_compile.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-func_identifier.cxx b/Modules/FindCXXFeatures/cxx11-func_identifier.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-func_identifier.cxx
rename to Modules/FindCXXFeatures/cxx11-func_identifier.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-initializer_list.cxx b/Modules/FindCXXFeatures/cxx11-initializer_list.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-initializer_list.cxx
rename to Modules/FindCXXFeatures/cxx11-initializer_list.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-lambda.cxx b/Modules/FindCXXFeatures/cxx11-lambda.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-lambda.cxx
rename to Modules/FindCXXFeatures/cxx11-lambda.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-long_long.cxx b/Modules/FindCXXFeatures/cxx11-long_long.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-long_long.cxx
rename to Modules/FindCXXFeatures/cxx11-long_long.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-nullptr.cxx b/Modules/FindCXXFeatures/cxx11-nullptr.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-nullptr.cxx
rename to Modules/FindCXXFeatures/cxx11-nullptr.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-nullptr_fail_compile.cxx b/Modules/FindCXXFeatures/cxx11-nullptr_fail_compile.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-nullptr_fail_compile.cxx
rename to Modules/FindCXXFeatures/cxx11-nullptr_fail_compile.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-rvalue_references.cxx b/Modules/FindCXXFeatures/cxx11-rvalue_references.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-rvalue_references.cxx
rename to Modules/FindCXXFeatures/cxx11-rvalue_references.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-sizeof_member.cxx b/Modules/FindCXXFeatures/cxx11-sizeof_member.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-sizeof_member.cxx
rename to Modules/FindCXXFeatures/cxx11-sizeof_member.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-static_assert.cxx b/Modules/FindCXXFeatures/cxx11-static_assert.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-static_assert.cxx
rename to Modules/FindCXXFeatures/cxx11-static_assert.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-static_assert_fail_compile.cxx b/Modules/FindCXXFeatures/cxx11-static_assert_fail_compile.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-static_assert_fail_compile.cxx
rename to Modules/FindCXXFeatures/cxx11-static_assert_fail_compile.cxx
diff --git a/Modules/FindCXXFeatures/cxx11-test-variadic_templates.cxx b/Modules/FindCXXFeatures/cxx11-variadic_templates.cxx
similarity index 100%
rename from Modules/FindCXXFeatures/cxx11-test-variadic_templates.cxx
rename to Modules/FindCXXFeatures/cxx11-variadic_templates.cxx
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ce08b5245673aa9e401ca561a43bd1853736d2c
commit 5ce08b5245673aa9e401ca561a43bd1853736d2c
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 4 19:38:30 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Aug 4 19:38:30 2013 +0200
CXXFeatures: add test for delegating constructors
diff --git a/Modules/FindCXXFeatures.cmake b/Modules/FindCXXFeatures.cmake
index 250bc7c..c74db88 100644
--- a/Modules/FindCXXFeatures.cmake
+++ b/Modules/FindCXXFeatures.cmake
@@ -10,6 +10,7 @@
# CXXFeatures_cstdint_header_FOUND - cstdint header
# CXXFeatures_decltype_FOUND - decltype keyword
# CXXFeatures_defaulted_functions_FOUND - default keyword for functions
+# CXXFeatures_delegating_constructors_FOUND - delegating constructors
# CXXFeatures_deleted_functions_FOUND - delete keyword for functions
# CXXFeatures_func_identifier_FOUND - __func__ preprocessor constant
# CXXFeatures_initializer_list_FOUND - initializer list
@@ -104,6 +105,7 @@ set(_CXX_ALL_FEATURES
cstdint_header
decltype
defaulted_functions
+ delegating_constructors
deleted_functions
func_identifier
initializer_list
diff --git a/Modules/FindCXXFeatures/cxx11-test-auto.cxx b/Modules/FindCXXFeatures/cxx11-test-auto.cxx
index cb600e5..19491e6 100644
--- a/Modules/FindCXXFeatures/cxx11-test-auto.cxx
+++ b/Modules/FindCXXFeatures/cxx11-test-auto.cxx
@@ -1,4 +1,3 @@
-
int main()
{
auto i = 5;
diff --git a/Modules/FindCXXFeatures/cxx11-test-delegating_constructors.cxx b/Modules/FindCXXFeatures/cxx11-test-delegating_constructors.cxx
new file mode 100644
index 0000000..e2f6abd
--- /dev/null
+++ b/Modules/FindCXXFeatures/cxx11-test-delegating_constructors.cxx
@@ -0,0 +1,25 @@
+class del {
+public:
+ del();
+ del(int k);
+
+ int m_k;
+};
+
+del::del()
+ : del(42)
+{
+}
+
+del::del(int k)
+ : m_k(k)
+{
+}
+
+int main()
+{
+ del q(41);
+ del a;
+
+ return a.m_k - q.m_k - 1;
+}
diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 74e939a..1a476c5 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -10,6 +10,7 @@ set(_all_cxx_features
CXXFeatures_cstdint_header_FOUND
CXXFeatures_decltype_FOUND
CXXFeatures_defaulted_functions_FOUND
+ CXXFeatures_delegating_constructors_FOUND
CXXFeatures_deleted_functions_FOUND
CXXFeatures_func_identifier_FOUND
CXXFeatures_initializer_list_FOUND
@@ -38,7 +39,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
set(_expected_cxx11_flag "-std=c++11")
list(APPEND _expected_features
- CXXFeatures_class_override_final_FOUND)
+ CXXFeatures_class_override_final_FOUND
+ CXXFeatures_delegating_constructors_FOUND)
endif ()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
list(APPEND _expected_features
@@ -95,6 +97,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
list(APPEND _expected_features
CXXFeatures_auto_FOUND
CXXFeatures_decltype_FOUND
+ CXXFeatures_delegating_constructors_FOUND
CXXFeatures_static_assert_FOUND
CXXFeatures_variadic_templates_FOUND)
endif ()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCXXFeatures.cmake | 4 ++-
.../{cxx11-test-auto.cxx => cxx11-auto.cxx} | 1 -
...ail_compile.cxx => cxx11-auto_fail_compile.cxx} | 0
...de_final.cxx => cxx11-class_override_final.cxx} | 0
...=> cxx11-class_override_final_fail_compile.cxx} | 0
...xx11-test-constexpr.cxx => cxx11-constexpr.cxx} | 0
...cstdint_header.cxx => cxx11-cstdint_header.cxx} | 0
...{cxx11-test-decltype.cxx => cxx11-decltype.cxx} | 0
...functions.cxx => cxx11-defaulted_functions.cxx} | 0
.../cxx11-delegating_constructors.cxx | 25 ++++++++++++++++++++
...d_functions.cxx => cxx11-deleted_functions.cxx} | 0
...xx => cxx11-deleted_functions_fail_compile.cxx} | 0
...nc_identifier.cxx => cxx11-func_identifier.cxx} | 0
...ializer_list.cxx => cxx11-initializer_list.cxx} | 0
.../{cxx11-test-lambda.cxx => cxx11-lambda.cxx} | 0
...xx11-test-long_long.cxx => cxx11-long_long.cxx} | 0
.../{cxx11-test-nullptr.cxx => cxx11-nullptr.cxx} | 0
..._compile.cxx => cxx11-nullptr_fail_compile.cxx} | 0
..._references.cxx => cxx11-rvalue_references.cxx} | 0
...t-sizeof_member.cxx => cxx11-sizeof_member.cxx} | 0
...t-static_assert.cxx => cxx11-static_assert.cxx} | 0
...le.cxx => cxx11-static_assert_fail_compile.cxx} | 0
..._templates.cxx => cxx11-variadic_templates.cxx} | 0
Tests/Module/CXXFeatures/CMakeLists.txt | 5 +++-
24 files changed, 32 insertions(+), 3 deletions(-)
rename Modules/FindCXXFeatures/{cxx11-test-auto.cxx => cxx11-auto.cxx} (99%)
rename Modules/FindCXXFeatures/{cxx11-test-auto_fail_compile.cxx => cxx11-auto_fail_compile.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-class_override_final.cxx => cxx11-class_override_final.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-class_override_final_fail_compile.cxx => cxx11-class_override_final_fail_compile.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-constexpr.cxx => cxx11-constexpr.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-cstdint_header.cxx => cxx11-cstdint_header.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-decltype.cxx => cxx11-decltype.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-defaulted_functions.cxx => cxx11-defaulted_functions.cxx} (100%)
create mode 100644 Modules/FindCXXFeatures/cxx11-delegating_constructors.cxx
rename Modules/FindCXXFeatures/{cxx11-test-deleted_functions.cxx => cxx11-deleted_functions.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-deleted_functions_fail_compile.cxx => cxx11-deleted_functions_fail_compile.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-func_identifier.cxx => cxx11-func_identifier.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-initializer_list.cxx => cxx11-initializer_list.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-lambda.cxx => cxx11-lambda.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-long_long.cxx => cxx11-long_long.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-nullptr.cxx => cxx11-nullptr.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-nullptr_fail_compile.cxx => cxx11-nullptr_fail_compile.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-rvalue_references.cxx => cxx11-rvalue_references.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-sizeof_member.cxx => cxx11-sizeof_member.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-static_assert.cxx => cxx11-static_assert.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-static_assert_fail_compile.cxx => cxx11-static_assert_fail_compile.cxx} (100%)
rename Modules/FindCXXFeatures/{cxx11-test-variadic_templates.cxx => cxx11-variadic_templates.cxx} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list