diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-28 16:39:37 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:01 +0000 |
| commit | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch) | |
| tree | 322337ad0acbc75732f916376ec6d36e7ec0e5bc /Source/cmake/WebKitHelpers.cmake | |
| parent | 6882a04fb36642862b11efe514251d32070c3d65 (diff) | |
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/cmake/WebKitHelpers.cmake')
| -rw-r--r-- | Source/cmake/WebKitHelpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake index a1e6503dd..0bf335527 100644 --- a/Source/cmake/WebKitHelpers.cmake +++ b/Source/cmake/WebKitHelpers.cmake @@ -4,7 +4,7 @@ include(CMakeParseArguments) macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target) set(options ENABLE_WERROR IGNORECXX_WARNINGS) CMAKE_PARSE_ARGUMENTS("OPTION" "${options}" "" "" ${ARGN}) - if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if (COMPILER_IS_GCC_OR_CLANG) get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS) if (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND") set(OLD_COMPILE_FLAGS "") @@ -16,7 +16,7 @@ macro(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target) endif () # Suppress -Wparentheses-equality warning of Clang - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if (COMPILER_IS_CLANG) set(OLD_COMPILE_FLAGS "-Wno-parentheses-equality ${OLD_COMPILE_FLAGS}") endif () |