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 ca6f06607b0b93781483eaf77c071c1584d32867 (commit)
via f94727a9c2d2a48ecca2297675a7762cdfae460f (commit)
from 86144dcd9106990de5c5329f9c8be60d7f329c89 (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=ca6f06607b0b93781483eaf77c071c1584d32867
commit ca6f06607b0b93781483eaf77c071c1584d32867
Merge: 86144dc f94727a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 17 14:36:05 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 17 14:36:05 2015 -0400
Merge topic 'mingw-compile-features' into next
f94727a9 Record compile features for GNU on Windows (#15443)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f94727a9c2d2a48ecca2297675a7762cdfae460f
commit f94727a9c2d2a48ecca2297675a7762cdfae460f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 17 13:31:44 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 17 13:32:08 2015 -0400
Record compile features for GNU on Windows (#15443)
Drop the 'UNIX' condition on GNU compiler features.
Suggested-by: David Demelier <demelier.da...@gmail.com>
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 86a31e4..2dc02f0 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -44,10 +44,10 @@ macro(cmake_record_cxx_compile_features)
endmacro()
set(_result 0)
- if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
_get_gcc_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION}
CMAKE_CXX14_COMPILE_FEATURES)
endif()
- if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
if (_result EQUAL 0)
_get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION}
CMAKE_CXX11_COMPILE_FEATURES)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/GNU-CXX.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
