[EFL] Build break using clang

https://bugs.webkit.org/show_bug.cgi?id=136245

Reviewed by Gyuyoung Kim.

.:

* Source/cmake/OptionsEfl.cmake:
Disable ENABLE_WERROR when compiler is Clang as workaround because there are too many warnings.
Some warnings are from system libraries.

Source/WebCore:

* css/ViewportStyleResolver.cpp: Includes NodeRenderStyle.h

Source/WebKit2:

* PlatformEfl.cmake: defines GTEST_HAS_RTTI=0

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172954 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3952eaa..fea3871 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-08-26  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break using clang
+        https://bugs.webkit.org/show_bug.cgi?id=136245
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsEfl.cmake:
+        Disable ENABLE_WERROR when compiler is Clang as workaround because there are too many warnings.
+        Some warnings are from system libraries.
+
 2014-08-25  Alberto Garcia  <berto@igalia.com>
 
         [GTK] Unify webkitgtk and webkit2gtk directories

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7329208..455169b 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-26  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break using clang
+        https://bugs.webkit.org/show_bug.cgi?id=136245
+
+        Reviewed by Gyuyoung Kim.
+
+        * css/ViewportStyleResolver.cpp: Includes NodeRenderStyle.h
+
 2014-08-26  Mark Rowe  <mrowe@apple.com>
 
         Build fix after r172951.

diff --git a/Source/WebCore/css/ViewportStyleResolver.cpp b/Source/WebCore/css/ViewportStyleResolver.cpp
index cbc398a..8d4129a 100644 (file)
--- a/Source/WebCore/css/ViewportStyleResolver.cpp
+++ b/Source/WebCore/css/ViewportStyleResolver.cpp
@@ -34,6 +34,7 @@
 
 #include "CSSValueKeywords.h"
 #include "Document.h"
+#include "NodeRenderStyle.h"
 #include "Page.h"
 #include "RenderView.h"
 #include "StyleProperties.h"

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8e13706..ff6c7df 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-26  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Build break using clang
+        https://bugs.webkit.org/show_bug.cgi?id=136245
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformEfl.cmake: defines GTEST_HAS_RTTI=0
+
 2014-08-25  Zalan Bujtas  <zalan@apple.com>
 
         Subpixel layout: remove roundedLayoutPoint/roundedLayoutSize functions.

diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index e0b6391..051279b 100644 (file)
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -454,6 +454,7 @@ add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
     -DWEBPROCESSNAME=\"WebProcess\"
     -DPLUGINPROCESSNAME=\"PluginProcess\"
     -DNETWORKPROCESSNAME=\"NetworkProcess\"
+    -DGTEST_HAS_RTTI=0
 )
 
 add_library(ewk2UnitTestUtils

diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index 77d9568..b12823a 100644 (file)
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -8,7 +8,10 @@ add_definitions(-DBUILDING_EFL__=1)
 set(ENABLE_WEBKIT OFF)
 set(ENABLE_WEBKIT2 ON)
 
-set(ADDITIONAL_COMPILER_FLAGS ENABLE_WERROR)
+# FIXME: Disable WERROR in clang build because of many warnings.
+if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(ADDITIONAL_COMPILER_FLAGS ENABLE_WERROR)
+endif ()
 
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)