[Cmake-commits] CMake branch, next, updated. v2.8.7-2573-g102b875
Rolf Eike Beer
eike at sf-mail.de
Sun Feb 12 04:46:20 EST 2012
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 102b875dcb134f80e20cfce0d8c84a8052517d6c (commit)
via 9b4e4c92aeae15f58438e3bb9846242daafcfc9c (commit)
via 62952bc9b451b2b658c20756fc4c714945d84b45 (commit)
from a2e8cbf70204b2c9fec6414d224be2da9fd2cf5f (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=102b875dcb134f80e20cfce0d8c84a8052517d6c
commit 102b875dcb134f80e20cfce0d8c84a8052517d6c
Merge: a2e8cbf 9b4e4c9
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Feb 12 04:46:17 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 12 04:46:17 2012 -0500
Merge topic 'open64-compiler-flags' into next
9b4e4c9 Improve checks for Open64 and g++ incompatible flags (#12119)
62952bc KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b4e4c92aeae15f58438e3bb9846242daafcfc9c
commit 9b4e4c92aeae15f58438e3bb9846242daafcfc9c
Author: Matthias Kretz <kretz at kde.org>
AuthorDate: Sun Feb 12 10:42:54 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Feb 12 10:42:54 2012 +0100
Improve checks for Open64 and g++ incompatible flags (#12119)
diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 5380f4d..3618bdf 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -9,6 +9,7 @@
#=============================================================================
# Copyright 2006-2011 Kitware, Inc.
# Copyright 2006 Alexander Neundorf <neundorf at kde.org>
+# Copyright 2011 Matthias Kretz <kretz at kde.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -35,6 +36,7 @@ MACRO (CHECK_C_COMPILER_FLAG _FLAG _RESULT)
FAIL_REGEX "[Uu]nknown option" # HP
FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
FAIL_REGEX "command option .* is not recognized" # XL
+ FAIL_REGEX "WARNING: unknown flag:" # Open64
)
SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
ENDMACRO (CHECK_C_COMPILER_FLAG)
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index 3da04b4..134f875 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -9,6 +9,7 @@
#=============================================================================
# Copyright 2006-2010 Kitware, Inc.
# Copyright 2006 Alexander Neundorf <neundorf at kde.org>
+# Copyright 2011 Matthias Kretz <kretz at kde.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -27,6 +28,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
CHECK_CXX_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}
# Some compilers do not fail with a bad flag
+ FAIL_REGEX "command line option .* is valid for .* but not for C\\\\+\\\\+" # GNU
FAIL_REGEX "unrecognized .*option" # GNU
FAIL_REGEX "unknown .*option" # Clang
FAIL_REGEX "ignoring unknown option" # MSVC
@@ -36,6 +38,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
FAIL_REGEX "command option .* is not recognized" # XL
FAIL_REGEX "not supported in this configuration; ignored" # AIX
FAIL_REGEX "File with unknown suffix passed to linker" # PGI
+ FAIL_REGEX "WARNING: unknown flag:" # Open64
)
SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
ENDMACRO (CHECK_CXX_COMPILER_FLAG)
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckCCompilerFlag.cmake | 2 ++
Modules/CheckCXXCompilerFlag.cmake | 3 +++
Source/kwsys/kwsysDateStamp.cmake | 2 +-
3 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list