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 e7bbf8c3ce1362f30602b73e57feb36af14b46ac (commit)
via f4de2ab585caf8a9c6773fa4507008b83a1ca2cf (commit)
via 771e9f2fe79ec1a1bdf8189f88e48704e97b827e (commit)
via c381c193a1ceeb79cf84ab905a0076c783b32707 (commit)
from bef58c63926fdb86c63525bed0ea57ed40d9e529 (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=e7bbf8c3ce1362f30602b73e57feb36af14b46ac
commit e7bbf8c3ce1362f30602b73e57feb36af14b46ac
Merge: bef58c6 f4de2ab
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Wed Feb 1 14:56:48 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Feb 1 14:56:48 2017 -0500
Merge topic 'gcc-features' into next
f4de2ab5 GNU C++: record that -fvisibility-inlines-hidden is available
since 4.0
771e9f2f GNU C: record that C99 is available since at least 3.4
c381c193 Tests/Module/WCDH: write multi_file_compiler_detection.h before
using it
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4de2ab585caf8a9c6773fa4507008b83a1ca2cf
commit f4de2ab585caf8a9c6773fa4507008b83a1ca2cf
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Jan 27 16:52:42 2017 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Feb 1 20:53:00 2017 +0100
GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
See https://gcc.gnu.org/onlinedocs/gcc-4.0.0/gcc/Option-Summary.html
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index b04ea11..c007c98 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -6,7 +6,7 @@ if (WIN32)
set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fno-keep-inline-dllexport")
endif()
else()
- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.2)
+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN
"-fvisibility-inlines-hidden")
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=771e9f2fe79ec1a1bdf8189f88e48704e97b827e
commit 771e9f2fe79ec1a1bdf8189f88e48704e97b827e
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Jan 27 16:49:45 2017 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Feb 1 20:53:00 2017 +0100
GNU C: record that C99 is available since at least 3.4
diff --git a/Help/release/dev/gcc-features.rst
b/Help/release/dev/gcc-features.rst
new file mode 100644
index 0000000..c6959ab
--- /dev/null
+++ b/Help/release/dev/gcc-features.rst
@@ -0,0 +1,5 @@
+gcc-features
+------------
+
+* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
+ is now aware of the availability of C99 in gcc since 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 05c3bb2..3f02618 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}")
@@ -38,10 +38,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
endif()
endif()
-
macro(cmake_record_c_compile_features)
set(_result 0)
- if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
if(_result EQUAL 0 AND CMAKE_C11_STANDARD_COMPILE_OPTION)
_record_compiler_features_c(11)
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c381c193a1ceeb79cf84ab905a0076c783b32707
commit c381c193a1ceeb79cf84ab905a0076c783b32707
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Wed Feb 1 20:48:25 2017 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Feb 1 20:52:59 2017 +0100
Tests/Module/WCDH: write multi_file_compiler_detection.h before using it
This was broken in commit 98e6d1e5e426c491e04faa746c11746002e6a69d
(Tests/Module/WCDH: make it work with only C features defined) when all C
tests
were made accessible even if no C++ features are available, but the header
was
only created if C++ features are available. Fix it by creating the header
unconditionally before any checks on the available features.
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 7957ab8..a8406dd 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -20,6 +20,17 @@ write_compiler_detection_header(
${cxx_known_features} ${c_known_features}
)
+write_compiler_detection_header(
+ FILE
"${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/multi_file_compiler_detection.h"
+ PREFIX MULTI
+ OUTPUT_FILES_VAR multi_files
+ OUTPUT_DIR
"${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support"
+ COMPILERS GNU Clang AppleClang MSVC SunPro Intel
+ VERSION 3.1
+ FEATURES
+ ${cxx_known_features} ${c_known_features}
+)
+
macro(set_defines target true_defs false_defs)
set(defines)
foreach(def ${true_defs})
@@ -116,17 +127,6 @@ add_executable(WriteCompilerDetectionHeader main.cpp)
set_property(TARGET WriteCompilerDetectionHeader PROPERTY CXX_STANDARD 98)
set_defines(WriteCompilerDetectionHeader "${true_defs}" "${false_defs}")
-write_compiler_detection_header(
- FILE
"${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/multi_file_compiler_detection.h"
- PREFIX MULTI
- OUTPUT_FILES_VAR multi_files
- OUTPUT_DIR
"${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support"
- COMPILERS GNU Clang AppleClang MSVC SunPro Intel
- VERSION 3.1
- FEATURES
- ${cxx_known_features} ${c_known_features}
-)
-
add_executable(multi_files multi_files.cpp)
set_property(TARGET multi_files PROPERTY CXX_STANDARD 98)
target_include_directories(multi_files PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files)
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/gcc-features.rst | 5 +++++
Modules/Compiler/GNU-C-FeatureTests.cmake | 10 ++++-----
Modules/Compiler/GNU-C.cmake | 9 ++++----
Modules/Compiler/GNU-CXX.cmake | 2 +-
.../WriteCompilerDetectionHeader/CMakeLists.txt | 22 ++++++++++----------
5 files changed, 26 insertions(+), 22 deletions(-)
create mode 100644 Help/release/dev/gcc-features.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
