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 96e6af9b42fe723992a877272d03e0a7b14f37cc (commit)
via 046b2b4d4a42d4e5ebe0a7abc8651163065ed505 (commit)
from cf1a414cfb2917588a6eff20cc8cdda4c98264d9 (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=96e6af9b42fe723992a877272d03e0a7b14f37cc
commit 96e6af9b42fe723992a877272d03e0a7b14f37cc
Merge: cf1a414 046b2b4
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Feb 22 02:08:22 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Feb 22 02:08:22 2016 -0500
Merge topic 'gnu-c-34' into next
046b2b4d Compiler Features: gcc can handle C99 since at least 3.4
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=046b2b4d4a42d4e5ebe0a7abc8651163065ed505
commit 046b2b4d4a42d4e5ebe0a7abc8651163065ed505
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Sat Feb 20 13:59:34 2016 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Sat Feb 20 13:59:34 2016 +0100
Compiler Features: gcc can handle C99 since at least 3.4
diff --git a/Help/release/dev/gnu-c-34.rst b/Help/release/dev/gnu-c-34.rst
new file mode 100644
index 0000000..2fab592
--- /dev/null
+++ b/Help/release/dev/gnu-c-34.rst
@@ -0,0 +1,6 @@
+gnu-c-34
+--------------
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+ is now aware that the GNU compilers can handle C99 since at least version
+ 3.4.
diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake
b/Modules/Compiler/GNU-C-FeatureTests.cmake
index b3fe33f..0ab5265 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -1,5 +1,5 @@
-set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304")
# GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it
# to 201000L. As the former is strictly greater than the latter, test only
@@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__)
>= 404")
# to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests.
set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 &&
defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
set(_cmake_feature_test_c_static_assert "${GNU46_C11}")
-# Since 4.4 at least:
-set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 &&
defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
-set(_cmake_feature_test_c_restrict "${GNU44_C99}")
-set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
+# Since 3.4 at least:
+set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 &&
defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(_cmake_feature_test_c_restrict "${GNU34_C99}")
+set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}")
set(GNU_C90 "${_cmake_oldestSupported}")
set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 2c478da..f76e07f 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -4,12 +4,12 @@ __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()
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
endif()
@@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
endif()
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
if (NOT CMAKE_C_COMPILER_FORCED)
if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version
${CMAKE_C_COMPILER_VERSION}")
@@ -48,7 +48,7 @@ macro(cmake_record_c_compile_features)
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
_get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION}
CMAKE_C11_COMPILE_FEATURES)
endif()
- if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
if (_result EQUAL 0)
_get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION}
CMAKE_C99_COMPILE_FEATURES)
endif()
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/gnu-c-34.rst | 6 ++++++
Modules/Compiler/GNU-C-FeatureTests.cmake | 10 +++++-----
Modules/Compiler/GNU-C.cmake | 8 ++++----
3 files changed, 15 insertions(+), 9 deletions(-)
create mode 100644 Help/release/dev/gnu-c-34.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
