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 57e8b86866517c1fdc75b93fdc03b791247f95dd (commit) via 147278046f9f2200de276c84f61cde9ec0a5b2c4 (commit) from 0144470b71bd9c1d0ec138ebda9cb28d8b762009 (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=57e8b86866517c1fdc75b93fdc03b791247f95dd commit 57e8b86866517c1fdc75b93fdc03b791247f95dd Merge: 0144470 1472780 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Sat Jan 10 12:47:24 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Jan 10 12:47:24 2015 -0500 Merge topic 'Apple-GNU-compiler-features' into next 14727804 Record compile features for GNU on Apple. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=147278046f9f2200de276c84f61cde9ec0a5b2c4 commit 147278046f9f2200de276c84f61cde9ec0a5b2c4 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Fri Jan 9 20:18:25 2015 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Sat Jan 10 18:46:59 2015 +0100 Record compile features for GNU on Apple. Tested with GNU 4.8 binary (bottle) from homebrew, and assumed to work with the others. diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 9018450..db9089d 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -23,7 +23,7 @@ macro(cmake_record_c_compile_features) record_compiler_features(C "${std_version}" ${list}) endmacro() - if (UNIX AND NOT APPLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7) + if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7) _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES) if (_result EQUAL 0) _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES) diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake index a91c901..4a26963 100644 --- a/Modules/Compiler/GNU-CXX.cmake +++ b/Modules/Compiler/GNU-CXX.cmake @@ -39,10 +39,10 @@ macro(cmake_record_cxx_compile_features) endmacro() set(_result 0) - if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) + if (UNIX AND 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 APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7) + if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7) if (_result EQUAL 0) _get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES) endif() ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/GNU-C.cmake | 2 +- Modules/Compiler/GNU-CXX.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits