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 73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81 (commit)
via cfbc407faab422db01e4a7d2c4e5a7c3acdc9951 (commit)
from 8be34d3d4c4669793f8a400dfa111230d92af701 (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=73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81
commit 73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81
Merge: 8be34d3 cfbc407
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 9 16:06:29 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 9 16:06:29 2017 -0500
Merge topic 'gcc-34-features' into next
cfbc407f Revert topic 'gcc-34-features'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfbc407faab422db01e4a7d2c4e5a7c3acdc9951
commit cfbc407faab422db01e4a7d2c4e5a7c3acdc9951
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 9 16:06:14 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jan 9 16:06:14 2017 -0500
Revert topic 'gcc-34-features'
It will be revised and restored with an alternative approach.
diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 7da526a..9b35f27 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -32,14 +32,14 @@ if (CMAKE_CXX_COMPILE_FEATURES)
endif()
add_executable(target_compile_features${target_suffix} main.cpp)
target_compile_features(target_compile_features${target_suffix}
- PRIVATE cxx_long_long_type
+ PRIVATE cxx_auto_type
)
- add_library(lib_long_long_type lib_long_long_type.cpp)
- target_compile_features(lib_long_long_type
- PUBLIC cxx_long_long_type
+ add_library(lib_auto_type lib_auto_type.cpp)
+ target_compile_features(lib_auto_type
+ PUBLIC cxx_auto_type
)
add_executable(lib_user lib_user.cpp)
- target_link_libraries(lib_user lib_long_long_type)
+ target_link_libraries(lib_user lib_auto_type)
endif()
diff --git a/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
b/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
new file mode 100644
index 0000000..71b2215
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
@@ -0,0 +1,6 @@
+
+int getAutoTypeImpl()
+{
+ auto i = 0;
+ return i;
+}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
b/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
new file mode 100644
index 0000000..c825b10
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
@@ -0,0 +1,8 @@
+
+int getAutoTypeImpl();
+
+int getAutoType()
+{
+ auto i = getAutoTypeImpl();
+ return i;
+}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
deleted file mode 100644
index 4d3a896..0000000
--- a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-int getLLTypeImpl(long long &l)
-{
- int i = 64;
- while(l) {
- if(l & 1)
- i--;
- l >>= 1;
- }
- return i;
-}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
deleted file mode 100644
index 8111382..0000000
--- a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-int getLLTypeImpl(long long &);
-
-int getLLType(int i)
-{
- long long l = i;
- return getLLTypeImpl(l);
-}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_user.cpp
b/Tests/CMakeCommands/target_compile_features/lib_user.cpp
index 8e6f860..541e528 100644
--- a/Tests/CMakeCommands/target_compile_features/lib_user.cpp
+++ b/Tests/CMakeCommands/target_compile_features/lib_user.cpp
@@ -1,7 +1,7 @@
-#include "lib_long_long_type.h"
+#include "lib_auto_type.h"
int main(int argc, char** argv)
{
- return getLLType(42);
+ return getAutoType();
}
diff --git a/Tests/CMakeCommands/target_compile_features/main.cpp
b/Tests/CMakeCommands/target_compile_features/main.cpp
index aee232a..6f5daee 100644
--- a/Tests/CMakeCommands/target_compile_features/main.cpp
+++ b/Tests/CMakeCommands/target_compile_features/main.cpp
@@ -1,6 +1,6 @@
int main(int, char**)
{
- long long i = 1 << 31;
- return (i << 1) == 0;
+ auto i = 0;
+ return i;
}
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index 7c5aa88..0405def 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -278,7 +278,7 @@ if (CMAKE_CXX_COMPILE_FEATURES)
add_executable(CompileFeatures main.cpp)
set_property(TARGET CompileFeatures
- PROPERTY COMPILE_FEATURES "cxx_long_long_type"
+ PROPERTY COMPILE_FEATURES "cxx_auto_type"
)
set_property(TARGET CompileFeatures
PROPERTY CXX_STANDARD_REQUIRED TRUE
@@ -291,7 +291,7 @@ if (CMAKE_CXX_COMPILE_FEATURES)
add_library(iface INTERFACE)
set_property(TARGET iface
- PROPERTY INTERFACE_COMPILE_FEATURES "cxx_long_long_type"
+ PROPERTY INTERFACE_COMPILE_FEATURES "cxx_auto_type"
)
add_executable(IfaceCompileFeatures main.cpp)
target_link_libraries(IfaceCompileFeatures iface)
diff --git a/Tests/CompileFeatures/main.cpp b/Tests/CompileFeatures/main.cpp
index 5472cab..c5a7a46 100644
--- a/Tests/CompileFeatures/main.cpp
+++ b/Tests/CompileFeatures/main.cpp
@@ -1,6 +1,6 @@
int main(int, char**)
{
- long long value = 1 << 31;
- return (value << 1) == 0;
+ auto value = 0;
+ return value;
}
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeCommands/target_compile_features/CMakeLists.txt | 10 +++++-----
.../CMakeCommands/target_compile_features/lib_auto_type.cpp | 6 ++++++
Tests/CMakeCommands/target_compile_features/lib_auto_type.h | 8 ++++++++
.../target_compile_features/lib_long_long_type.cpp | 11 -----------
.../target_compile_features/lib_long_long_type.h | 8 --------
Tests/CMakeCommands/target_compile_features/lib_user.cpp | 4 ++--
Tests/CMakeCommands/target_compile_features/main.cpp | 4 ++--
Tests/CompileFeatures/CMakeLists.txt | 4 ++--
Tests/CompileFeatures/main.cpp | 4 ++--
9 files changed, 27 insertions(+), 32 deletions(-)
create mode 100644
Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
create mode 100644 Tests/CMakeCommands/target_compile_features/lib_auto_type.h
delete mode 100644
Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
delete mode 100644
Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
