[Cmake-commits] CMake branch, next, updated. v3.7.1-1805-g369bfc7

[Rolf Eike Beer]

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  369bfc70d8548baaad751c11d36b88f7c2678f78 (commit)
       via  b59ed27ea731244fad7276182467b1076704a10a (commit)
       via  6bb3ebd485cd92c3c9760432dd4db716ec831723 (commit)
      from  8c6f5311aea01e3d8dd597c6f5c847bb55420471 (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=369bfc70d8548baaad751c11d36b88f7c2678f78
commit 369bfc70d8548baaad751c11d36b88f7c2678f78
Merge: 8c6f531 b59ed27
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Dec 16 10:58:01 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 16 10:58:01 2016 -0500

    Merge topic 'gcc-34-features' into next
    
    b59ed27e use cxx_long_long_type instead of cxx_auto_type to check C++ compile features
    6bb3ebd4 FIXUP: gcc 3.4 features


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59ed27ea731244fad7276182467b1076704a10a
commit b59ed27ea731244fad7276182467b1076704a10a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Dec 16 16:53:39 2016 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Dec 16 16:57:15 2016 +0100

    use cxx_long_long_type instead of cxx_auto_type to check C++ compile features
    
    Older gcc versions do not support auto, but already have some C++11 features
    available as extension.

diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 9b35f27..8a433cd 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -32,7 +32,7 @@ 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_auto_type
+    PRIVATE cxx_long_long_type
   )
 
   add_library(lib_auto_type lib_auto_type.cpp)
diff --git a/Tests/CMakeCommands/target_compile_features/main.cpp b/Tests/CMakeCommands/target_compile_features/main.cpp
index 6f5daee..9ebeefc 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**)
 {
-  auto i = 0;
-  return i;
+  long long i = 1 << 31;
+  return (i << 1) != 0;
 }
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 0405def..fbd868f 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_auto_type"
+    PROPERTY COMPILE_FEATURES "cxx_long_long_type"
   )
   set_property(TARGET CompileFeatures
     PROPERTY CXX_STANDARD_REQUIRED TRUE
diff --git a/Tests/CompileFeatures/main.cpp b/Tests/CompileFeatures/main.cpp
index c5a7a46..7abf90f 100644
--- a/Tests/CompileFeatures/main.cpp
+++ b/Tests/CompileFeatures/main.cpp
@@ -1,6 +1,6 @@
 
 int main(int, char**)
 {
-  auto value = 0;
-  return value;
+  long long value = 1 << 31;
+  return (value << 1) != 0;
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bb3ebd485cd92c3c9760432dd4db716ec831723
commit 6bb3ebd485cd92c3c9760432dd4db716ec831723
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Dec 16 16:50:45 2016 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Dec 16 16:57:15 2016 +0100

    FIXUP: gcc 3.4 features

diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 48442dd..3f02618 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -4,7 +4,7 @@ __compiler_gnu(C)
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
-elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89")
 endif()
@@ -38,7 +38,6 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   endif()
 endif()
 
-
 macro(cmake_record_c_compile_features)
   set(_result 0)
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)

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

Summary of changes:
 Modules/Compiler/GNU-C.cmake                               |    3 +--
 Tests/CMakeCommands/target_compile_features/CMakeLists.txt |    2 +-
 Tests/CMakeCommands/target_compile_features/main.cpp       |    4 ++--
 Tests/CompileFeatures/CMakeLists.txt                       |    2 +-
 Tests/CompileFeatures/main.cpp                             |    4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake