[Cmake-commits] CMake branch, next, updated. v3.1.1-2602-g3a3d9fb
Stephen Kelly
steveire at gmail.com
Wed Feb 4 16:06:38 EST 2015
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 3a3d9fb5810cd408a232df2fcb86599624eb216b (commit)
via 43cdef5bbde4616bce8be3144d0cdfa005cece03 (commit)
via 572dbfc18ee29474590ca8170074190c074761f5 (commit)
from 20dca828e47efc9d01f6f7ead0a0691a142f3175 (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=3a3d9fb5810cd408a232df2fcb86599624eb216b
commit 3a3d9fb5810cd408a232df2fcb86599624eb216b
Merge: 20dca82 43cdef5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 16:06:37 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 4 16:06:37 2015 -0500
Merge topic 'fix-C-standard-features' into next
43cdef5b Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
572dbfc1 AppleClang: Remove redundant UNIX condition.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43cdef5bbde4616bce8be3144d0cdfa005cece03
commit 43cdef5bbde4616bce8be3144d0cdfa005cece03
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 22:04:18 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 22:04:18 2015 +0100
Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 00d2633..10454f6 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -12,7 +12,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
endif()
-set(CMAKE_C_STANDARD_DEFAULT 99)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
+ set(CMAKE_C_STANDARD_DEFAULT 99)
+endif()
macro(cmake_record_c_compile_features)
macro(_get_appleclang_features std_version list)
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 6d58be3..5194da4 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -19,7 +19,9 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
+ set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
macro(cmake_record_cxx_compile_features)
macro(_get_appleclang_features std_version list)
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index e07eace..84b2c74 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -31,7 +31,9 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+ set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
macro(cmake_record_cxx_compile_features)
macro(_get_clang_features std_version list)
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index fa97a94..89704e6 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -24,7 +24,7 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
set(CMAKE_C_STANDARD_DEFAULT 11)
-else()
+elseif(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
set(CMAKE_C_STANDARD_DEFAULT 90)
endif()
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index c471daf..86a31e4 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -34,7 +34,9 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+ set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
macro(cmake_record_cxx_compile_features)
macro(_get_gcc_features std_version list)
diff --git a/Modules/Compiler/MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake
index 962aaeb..82ce069 100644
--- a/Modules/Compiler/MSVC-CXX.cmake
+++ b/Modules/Compiler/MSVC-CXX.cmake
@@ -1,5 +1,8 @@
-# MSVC has no specific language level or flags to change it.
-set(CMAKE_CXX_STANDARD_DEFAULT "")
+
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
+ # MSVC has no specific language level or flags to change it.
+ set(CMAKE_CXX_STANDARD_DEFAULT "")
+endif()
macro(cmake_record_cxx_compile_features)
record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index cb37713..c7bc734 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -37,7 +37,9 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
endif()
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+ set(CMAKE_CXX_STANDARD_DEFAULT 98)
+endif()
macro(cmake_record_cxx_compile_features)
macro(_get_solaris_studio_features std_version list)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=572dbfc18ee29474590ca8170074190c074761f5
commit 572dbfc18ee29474590ca8170074190c074761f5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 4 22:03:49 2015 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 4 22:03:49 2015 +0100
AppleClang: Remove redundant UNIX condition.
diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 16f420f..00d2633 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -20,7 +20,7 @@ macro(cmake_record_c_compile_features)
endmacro()
set(_result 0)
- if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
+ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
_get_appleclang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
if (_result EQUAL 0)
_get_appleclang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 978c382..6d58be3 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -27,7 +27,7 @@ macro(cmake_record_cxx_compile_features)
endmacro()
set(_result 0)
- if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
set(_result 0)
if(CMAKE_CXX14_STANDARD_COMPILE_OPTION)
_get_appleclang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/AppleClang-C.cmake | 6 ++++--
Modules/Compiler/AppleClang-CXX.cmake | 6 ++++--
Modules/Compiler/Clang-CXX.cmake | 4 +++-
Modules/Compiler/GNU-C.cmake | 2 +-
Modules/Compiler/GNU-CXX.cmake | 4 +++-
Modules/Compiler/MSVC-CXX.cmake | 7 +++++--
Modules/Compiler/SunPro-CXX.cmake | 4 +++-
7 files changed, 23 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list