diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2015-07-08 09:09:48 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2015-07-08 07:16:01 +0000 |
| commit | 8fdd49aaa1ed50ee0d6b0cee00f85e891c144fa9 (patch) | |
| tree | 8d1d2ec00d3e4ba56eb46146adaa705ee7617eba /cmake/modules | |
| parent | d7f0118a74d540d3c8b07296c2c7b248ed13b464 (diff) | |
Duplicate CheckCCompilerFlag for CXX.
Correctly detect that XCode7Beta1 does not support -fno-delete-null-pointer-checks
by adding a new regex.
Change-Id: I76e0b6bb72094e6e75dae9be97bc7ee8e7051792
Reviewed-on: https://code.wireshark.org/review/9552
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/CheckCCompilerFlag.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/CheckCXXCompilerFlag.cmake | 59 |
2 files changed, 60 insertions, 0 deletions
diff --git a/cmake/modules/CheckCCompilerFlag.cmake b/cmake/modules/CheckCCompilerFlag.cmake index 2a93138b43..ac21e0f756 100644 --- a/cmake/modules/CheckCCompilerFlag.cmake +++ b/cmake/modules/CheckCCompilerFlag.cmake @@ -38,6 +38,7 @@ macro (CHECK_C_COMPILER_FLAG _FLAG _RESULT) FAIL_REGEX "unrecognized .*option" # GNU FAIL_REGEX "unknown .*option" # Clang FAIL_REGEX "argument unused during compilation: " # Clang + FAIL_REGEX "optimization flag .* is not supported" # Clang FAIL_REGEX "ignoring unknown option" # MSVC FAIL_REGEX "warning D9002" # MSVC, any lang FAIL_REGEX "option.*not supported" # Intel diff --git a/cmake/modules/CheckCXXCompilerFlag.cmake b/cmake/modules/CheckCXXCompilerFlag.cmake new file mode 100644 index 0000000000..7204219663 --- /dev/null +++ b/cmake/modules/CheckCXXCompilerFlag.cmake @@ -0,0 +1,59 @@ +# - Check whether the CXX compiler supports a given flag. +# CHECK_CXX_COMPILER_FLAG(<flag> <var>) +# <flag> - the compiler flag +# <var> - variable to store the result +# This internally calls the check_cxx_source_compiles macro. +# See help for CheckCXXSourceCompiles for a listing of variables +# that can modify the build. + +#============================================================================= +# Copyright 2006-2011 Kitware, Inc. +# Copyright 2006 Alexander Neundorf <neundorf@kde.org> +# Copyright 2011 Matthias Kretz <kretz@kde.org> +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +include(CheckCXXSourceCompiles) + +macro (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT) + set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") + set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}" ${CMAKE_REQUIRED_DEFINITIONS}) + # Normalize locale during test compilation. + set(_CheckCXXCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG) + foreach(v ${_CheckCXXCompilerFlag_LOCALE_VARS}) + set(_CheckCXXCompilerFlag_SAVED_${v} "$ENV{${v}}") + set(ENV{${v}} C) + endforeach() + 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 "argument unused during compilation: " # Clang + FAIL_REGEX "optimization flag .* is not supported" # Clang + FAIL_REGEX "ignoring unknown option" # MSVC + FAIL_REGEX "warning D9002" # MSVC, any lang + FAIL_REGEX "option.*not supported" # Intel + FAIL_REGEX "invalid argument .*option" # Intel + FAIL_REGEX "ignoring option .*argument required" # Intel + 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 + ) + foreach(v ${_CheckCXXCompilerFlag_LOCALE_VARS}) + set(ENV{${v}} ${_CheckCXXCompilerFlag_SAVED_${v}}) + unset(_CheckCXXCompilerFlag_SAVED_${v}) + endforeach() + unset(_CheckCXXCompilerFlag_LOCALE_VARS) + + set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") +endmacro () |