[EFL] Move Efl specific code from Source/CMakeLists.txt

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

Reviewed by Gyuyoung Kim.

WebKit/Efl only uses ENABLE_WERROR so it can be moved into OptionsEfl.cmake.
Inaddition, renamed ADDITIONAL_FLAGS to ADDITIONAL_COMPILER_FLAGS.

* Source/CMakeLists.txt:
* Source/cmake/OptionsEfl.cmake:

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

diff --git a/ChangeLog b/ChangeLog
index 66fd0fd..c85d626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2014-08-24  Ryuan Choi  <ryuan.choi@samsung.com>
 
+        [EFL] Move Efl specific code from Source/CMakeLists.txt
+        https://bugs.webkit.org/show_bug.cgi?id=136206
+
+        Reviewed by Gyuyoung Kim.
+
+        WebKit/Efl only uses ENABLE_WERROR so it can be moved into OptionsEfl.cmake.
+        Inaddition, renamed ADDITIONAL_FLAGS to ADDITIONAL_COMPILER_FLAGS.
+
+        * Source/CMakeLists.txt:
+        * Source/cmake/OptionsEfl.cmake:
+
+2014-08-24  Ryuan Choi  <ryuan.choi@samsung.com>
+
         [EFL] Introduce DEVELOPER_MODE
         https://bugs.webkit.org/show_bug.cgi?id=135884
 

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 3736eea..5486720 100644 (file)
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -26,24 +26,20 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 # -----------------------------------------------------------------------------
 # Set compiler flags for all targets
 # -----------------------------------------------------------------------------
-if (${PORT} STREQUAL "Efl")
-    set(ADDITIONAL_FLAGS ENABLE_WERROR)
-endif ()
-
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_FLAGS})
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(JavaScriptCore ${ADDITIONAL_FLAGS})
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(WTF ${ADDITIONAL_COMPILER_FLAGS})
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(JavaScriptCore ${ADDITIONAL_COMPILER_FLAGS})
 
 if (ENABLE_WEBCORE)
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_FLAGS})
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreTestSupport ${ADDITIONAL_COMPILER_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCore ${ADDITIONAL_COMPILER_FLAGS})
 endif ()
 
 if (ENABLE_WEBKIT)
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_COMPILER_FLAGS})
 endif ()
 
 if (ENABLE_WEBKIT2)
-    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_FLAGS})
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_COMPILER_FLAGS})
 endif ()
 
 # -----------------------------------------------------------------------------

diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index b17bb28..77d9568 100644 (file)
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -8,6 +8,8 @@ add_definitions(-DBUILDING_EFL__=1)
 set(ENABLE_WEBKIT OFF)
 set(ENABLE_WEBKIT2 ON)
 
+set(ADDITIONAL_COMPILER_FLAGS ENABLE_WERROR)
+
 find_package(Cairo 1.10.2 REQUIRED)
 find_package(Fontconfig 2.8.0 REQUIRED)
 find_package(Sqlite REQUIRED)