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 fcf07b5ac180c78f5d88d3aebad2120844a2e841 (commit)
via 965a50dceaa0abe2ec5870efcbc8ac0becd9615d (commit)
via 7f4154a4aa4bb121bad05884f48466489e346821 (commit)
via f40c19b5433aa601cd98fabd9491edc9aaf703b7 (commit)
from 7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcf07b5ac180c78f5d88d3aebad2120844a2e841
commit fcf07b5ac180c78f5d88d3aebad2120844a2e841
Merge: 7589b5f 965a50d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 21 15:53:42 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 21 15:53:42 2015 -0500
Merge topic 'GNU-4.4-compile-features' into next
965a50dc Features: Fix GNU 4.4 and 4.5 C standard level flags
7f4154a4 Features: Fix CompileFeatures non-feature tests for space in path
f40c19b5 Features: Fix CompileFeatures test for C non-features
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=965a50dceaa0abe2ec5870efcbc8ac0becd9615d
commit 965a50dceaa0abe2ec5870efcbc8ac0becd9615d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 21 15:45:39 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 21 15:47:13 2015 -0500
Features: Fix GNU 4.4 and 4.5 C standard level flags
The C90 flags were only the "89" versions until GNU 4.5.
The C11 flags were not introduced until GNU 4.6.
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 3036057..fa97a94 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -1,10 +1,15 @@
include(Compiler/GNU)
__compiler_gnu(C)
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+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)
+ 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)
set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
endif()
@@ -12,7 +17,7 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11")
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
-elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c1x")
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
endif()
@@ -29,8 +34,10 @@ macro(cmake_record_c_compile_features)
endmacro()
set(_result 0)
- if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+ if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
_get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION}
CMAKE_C11_COMPILE_FEATURES)
+ endif()
+ if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
if (_result EQUAL 0)
_get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION}
CMAKE_C99_COMPILE_FEATURES)
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f4154a4aa4bb121bad05884f48466489e346821
commit 7f4154a4aa4bb121bad05884f48466489e346821
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 21 15:42:08 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 21 15:42:08 2015 -0500
Features: Fix CompileFeatures non-feature tests for space in path
Fix the <lang>_non_features try_compile calls to work correctly when
there is a space in the path. Otherwise they all fail due to the space
instead of the lack of a feature.
diff --git a/Tests/CompileFeatures/CMakeLists.txt
b/Tests/CompileFeatures/CMakeLists.txt
index ccd6f30..a276f36 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -92,8 +92,9 @@ foreach(lang CXX C)
try_compile(${feature}_works
"${CMAKE_CURRENT_BINARY_DIR}/${feature}_test"
"${CMAKE_CURRENT_SOURCE_DIR}/feature_test.${${lang}_ext}"
- COMPILE_DEFINITIONS
"-DTEST=${CMAKE_CURRENT_SOURCE_DIR}/${feature}.${${lang}_ext}"
+ COMPILE_DEFINITIONS "-DTEST=${feature}.${${lang}_ext}"
CMAKE_FLAGS "-DCMAKE_${lang}_STANDARD=${${lang}_standard_flag}"
+ "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}"
OUTPUT_VARIABLE OUTPUT
)
if (${feature}_works)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f40c19b5433aa601cd98fabd9491edc9aaf703b7
commit f40c19b5433aa601cd98fabd9491edc9aaf703b7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 21 15:40:47 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 21 15:40:47 2015 -0500
Features: Fix CompileFeatures test for C non-features
Add a "feature_test.c" file corresponding to "feature_test.cpp" but for
the C language. This source will be needed by C_non_features entries.
diff --git a/Tests/CompileFeatures/feature_test.c
b/Tests/CompileFeatures/feature_test.c
new file mode 100644
index 0000000..4147f1f
--- /dev/null
+++ b/Tests/CompileFeatures/feature_test.c
@@ -0,0 +1,10 @@
+
+#define STRINGIFY_IMPL(X) #X
+#define STRINGIFY(X) STRINGIFY_IMPL(X)
+
+#include STRINGIFY(TEST)
+
+int main(void)
+{
+ return 0;
+}
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/GNU-C.cmake | 13 ++++++++++---
Tests/CompileFeatures/CMakeLists.txt | 3 ++-
.../CompileFeatures/{feature_test.cpp => feature_test.c} | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
copy Tests/CompileFeatures/{feature_test.cpp => feature_test.c} (88%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
