Changeset 206430 in webkit

Timestamp:

Sep 27, 2016 5:31:58 AM (8 years ago)

Author:

Konstantin Tokarev

Message:

[cmake] Added COMPILER_IS_GCC_OR_CLANG variable to simplify conditions.
​https://bugs.webkit.org/show_bug.cgi?id=162605

Reviewed by Michael Catanzaro.

• CMakeLists.txt:
• Source/cmake/OptionsCommon.cmake:
• Source/cmake/WebKitHelpers.cmake:

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)
• Source/cmake/WebKitHelpers.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -38 +38 @@
 
 string(TOLOWER ${PORT} WEBKIT_PORT_DIR)
+
+# -----------------------------------------------------------------------------
+# Determine the compiler
+# -----------------------------------------------------------------------------
+if (CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+    set(COMPILER_IS_GCC_OR_CLANG ON)
+endif ()
 
 # -----------------------------------------------------------------------------

trunk/ChangeLog

@@ +1 @@
+2016-09-27  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Added COMPILER_IS_GCC_OR_CLANG variable to simplify conditions.
+        https://bugs.webkit.org/show_bug.cgi?id=162605
+
+        Reviewed by Michael Catanzaro.
+
+        * CMakeLists.txt:
+        * Source/cmake/OptionsCommon.cmake:
+        * Source/cmake/WebKitHelpers.cmake:
+
 2016-09-26  Daniel Bates  <dabates@apple.com>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -30 +30 @@
 define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name")
 
-if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if (COMPILER_IS_GCC_OR_CLANG)
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing -fno-rtti")

trunk/Source/cmake/WebKitHelpers.cmake

@@ -5 +5 @@
     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")