diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-09 20:37:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-09 20:37:33 (GMT) |
| commit | b5f9be1d03deb7be87a615e8d3bb89ecf341e288 (patch) | |
| tree | 85905e1609d07b61d94e61aabec04b74967e8101 /Modules | |
| parent | 8eaf17227993dd736e1ff27e373557ced07d8351 (diff) | |
| parent | 79e02333a6753dd92a58d704c04f18a6d9189523 (diff) | |
| download | CMake-b5f9be1d03deb7be87a615e8d3bb89ecf341e288.zip CMake-b5f9be1d03deb7be87a615e8d3bb89ecf341e288.tar.gz CMake-b5f9be1d03deb7be87a615e8d3bb89ecf341e288.tar.bz2 | |
Merge topic 'CheckCompilerFlag-foreign-MSVC'
79e0233 BUG: Fix compiler flag test for non-English MSVC (#11336)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CheckCCompilerFlag.cmake | 3 | ||||
| -rw-r--r-- | Modules/CheckCXXCompilerFlag.cmake | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index 0068617..cf519b1 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -7,7 +7,7 @@ # that can modify the build. #============================================================================= -# Copyright 2006-2009 Kitware, Inc. +# Copyright 2006-2010 Kitware, Inc. # Copyright 2006 Alexander Neundorf <neundorf@kde.org> # # Distributed under the OSI-approved BSD License (the "License"); @@ -29,6 +29,7 @@ MACRO (CHECK_C_COMPILER_FLAG _FLAG _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 diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake index d8e4715..788bf35 100644 --- a/Modules/CheckCXXCompilerFlag.cmake +++ b/Modules/CheckCXXCompilerFlag.cmake @@ -7,7 +7,7 @@ # modify the build. #============================================================================= -# Copyright 2006-2009 Kitware, Inc. +# Copyright 2006-2010 Kitware, Inc. # Copyright 2006 Alexander Neundorf <neundorf@kde.org> # # Distributed under the OSI-approved BSD License (the "License"); @@ -29,6 +29,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _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 |