diff options
| author | Brad King <brad.king@kitware.com> | 2010-11-04 12:49:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-11-04 12:50:17 (GMT) |
| commit | 79e02333a6753dd92a58d704c04f18a6d9189523 (patch) | |
| tree | 1ada5cbb1c8f2b45ee1fe741ed88bf8019985136 | |
| parent | 1674961a3f4186fdb6194af152f806db858fe558 (diff) | |
| download | CMake-79e02333a6753dd92a58d704c04f18a6d9189523.zip CMake-79e02333a6753dd92a58d704c04f18a6d9189523.tar.gz CMake-79e02333a6753dd92a58d704c04f18a6d9189523.tar.bz2 | |
BUG: Fix compiler flag test for non-English MSVC (#11336)
Approach suggested by John Stark.
| -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 |