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 625c64a5f1243b9a8d1d6b5f55cadca81fb11715 (commit) via c28e2769482c12da53a3c01ea45f9ae6cdc1de34 (commit) via 4412fc0890ab4081432721b7578f9893f89406fd (commit) via 2437b40933bd8377815a51a8154a81d3a70dc0fc (commit) from c1870a21f6f955311580ff37542dd625f5d3171e (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=625c64a5f1243b9a8d1d6b5f55cadca81fb11715 commit 625c64a5f1243b9a8d1d6b5f55cadca81fb11715 Merge: c1870a2 c28e276 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Feb 24 11:50:23 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Feb 24 11:50:23 2012 -0500 Merge topic 'improve-generateexportheader' into next c28e276 GenerateExportHeader: improve compiler identification 4412fc0 GenerateExportHeader: remove unneeded code 2437b40 KWSys Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c28e2769482c12da53a3c01ea45f9ae6cdc1de34 commit c28e2769482c12da53a3c01ea45f9ae6cdc1de34 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Feb 24 17:48:02 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Feb 24 17:48:02 2012 +0100 GenerateExportHeader: improve compiler identification Use CMAKE_<LANG>_COMPILER_VERSION instead of calling the compiler. This macro predates those useful variables. This also fixes the issue that g++ version detection was not working if C language was not enabled. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index e1dcb51..51ba6fc 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -154,34 +154,15 @@ endmacro() macro(_test_compiler_hidden_visibility) - if(CMAKE_COMPILER_IS_GNUCXX) - exec_program(${CMAKE_C_COMPILER} ARGS --version - OUTPUT_VARIABLE _gcc_version_info) - string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" - _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: - if(NOT _gcc_version) - string(REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" - _gcc_version "${_gcc_version_info}") - endif() - - if("${_gcc_version}" VERSION_LESS "4.2") - set(GCC_TOO_OLD TRUE) - message(WARNING "GCC version older than 4.2") - endif() - endif() - - if(CMAKE_CXX_COMPILER_ID MATCHES Intel) - exec_program(${CMAKE_CXX_COMPILER} ARGS -V - OUTPUT_VARIABLE _intel_version_info) - string(REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" "\\1" - _intel_version "${_intel_version_info}") - - if(${_intel_version} VERSION_LESS "12.0") - set(_INTEL_TOO_OLD TRUE) - message(WARNING "Intel compiler older than 12.0") - endif() + if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2") + set(GCC_TOO_OLD TRUE) + message(WARNING "GCC version older than 4.2") + elseif(CMAKE_COMPILER_IS_GNUC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "4.2") + set(GCC_TOO_OLD TRUE) + message(WARNING "GCC version older than 4.2") + elseif(CMAKE_CXX_COMPILER_ID MATCHES Intel AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0") + set(_INTEL_TOO_OLD TRUE) + message(WARNING "Intel compiler older than 12.0") endif() http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4412fc0890ab4081432721b7578f9893f89406fd commit 4412fc0890ab4081432721b7578f9893f89406fd Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Fri Feb 24 17:13:22 2012 +0100 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Fri Feb 24 17:13:22 2012 +0100 GenerateExportHeader: remove unneeded code These expressions check for command line arguments unsupported by the compiler. We don't pass any custom flags here anyway so this isn't needed. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index f3f61f6..e1dcb51 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -149,13 +149,6 @@ include(CheckCXXCompilerFlag) macro(_check_cxx_compiler_attribute _ATTRIBUTE _RESULT) check_cxx_source_compiles("${_ATTRIBUTE} int somefunc() { return 0; } int main() { return somefunc();}" ${_RESULT} - # Some compilers do not fail with a bad flag - FAIL_REGEX "unrecognized .*option" # GNU - FAIL_REGEX "ignoring unknown option" # MSVC - FAIL_REGEX "warning D9002" # MSVC, any lang - FAIL_REGEX "[Uu]nknown option" # HP - FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro - FAIL_REGEX "command option .* is not recognized" # XL ) endmacro() ----------------------------------------------------------------------- Summary of changes: Modules/GenerateExportHeader.cmake | 44 +++++++---------------------------- Source/kwsys/kwsysDateStamp.cmake | 2 +- 2 files changed, 10 insertions(+), 36 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits