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 08f31611996f8c7878f6267bd3698056cb016f61 (commit)
via d1cdeeedc18387660759f09958b8e47b9162b83a (commit)
from 9220290194fffec111890c28ff17ff0b79947a5b (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=08f31611996f8c7878f6267bd3698056cb016f61
commit 08f31611996f8c7878f6267bd3698056cb016f61
Merge: 9220290 d1cdeee
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Sat Dec 17 09:00:32 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Dec 17 09:00:32 2016 -0500
Merge topic 'gcc-34-features' into next
d1cdeeed FIXUP: more auto -> long long test changes
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1cdeeedc18387660759f09958b8e47b9162b83a
commit d1cdeeedc18387660759f09958b8e47b9162b83a
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Sat Dec 17 15:00:05 2016 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Sat Dec 17 15:00:05 2016 +0100
FIXUP: more auto -> long long test changes
diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 8a433cd..7da526a 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -35,11 +35,11 @@ if (CMAKE_CXX_COMPILE_FEATURES)
PRIVATE cxx_long_long_type
)
- add_library(lib_auto_type lib_auto_type.cpp)
- target_compile_features(lib_auto_type
- PUBLIC 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_executable(lib_user lib_user.cpp)
- target_link_libraries(lib_user lib_auto_type)
+ target_link_libraries(lib_user lib_long_long_type)
endif()
diff --git a/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
b/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
deleted file mode 100644
index 71b2215..0000000
--- a/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-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
deleted file mode 100644
index c825b10..0000000
--- a/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-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
new file mode 100644
index 0000000..4d3a896
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
@@ -0,0 +1,11 @@
+
+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
new file mode 100644
index 0000000..8111382
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
@@ -0,0 +1,8 @@
+
+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 541e528..8e6f860 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_auto_type.h"
+#include "lib_long_long_type.h"
int main(int argc, char** argv)
{
- return getAutoType();
+ return getLLType(42);
}
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index fbd868f..7c5aa88 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -291,7 +291,7 @@ if (CMAKE_CXX_COMPILE_FEATURES)
add_library(iface INTERFACE)
set_property(TARGET iface
- PROPERTY INTERFACE_COMPILE_FEATURES "cxx_auto_type"
+ PROPERTY INTERFACE_COMPILE_FEATURES "cxx_long_long_type"
)
add_executable(IfaceCompileFeatures main.cpp)
target_link_libraries(IfaceCompileFeatures iface)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeCommands/target_compile_features/CMakeLists.txt | 8 ++++----
.../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/CompileFeatures/CMakeLists.txt | 2 +-
7 files changed, 26 insertions(+), 21 deletions(-)
delete mode 100644
Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
delete mode 100644 Tests/CMakeCommands/target_compile_features/lib_auto_type.h
create mode 100644
Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
create 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
