Title: [135813] trunk
- Revision
- 135813
- Author
- [email protected]
- Date
- 2012-11-26 20:37:01 -0800 (Mon, 26 Nov 2012)
Log Message
[EFL] CMake shows ENABLE_3D_RENDERING and ENABLE_WEBGL is still OFF when AC is enabled
https://bugs.webkit.org/show_bug.cgi?id=100829
Patch by Halton Huo <[email protected]> on 2012-11-26
Reviewed by Gyuyoung Kim.
In WebKitFeatures.cmake, only use ${_name} for condition to print
a option as ON will prevent the overridden ones in OptionsXXX.cmake,
should use ${_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name}} instead.
* Source/cmake/OptionsEfl.cmake: Turn on ENABLE_3D_RENDERING and
ENABLE_WEBGL
* Source/cmake/WebKitFeatures.cmake: Use
${_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name}} to as value of
a feature is enabled. Adjust options in lexicographical order.
Modified Paths
Diff
Modified: trunk/ChangeLog (135812 => 135813)
--- trunk/ChangeLog 2012-11-27 04:30:26 UTC (rev 135812)
+++ trunk/ChangeLog 2012-11-27 04:37:01 UTC (rev 135813)
@@ -1,3 +1,20 @@
+2012-11-26 Halton Huo <[email protected]>
+
+ [EFL] CMake shows ENABLE_3D_RENDERING and ENABLE_WEBGL is still OFF when AC is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=100829
+
+ Reviewed by Gyuyoung Kim.
+
+ In WebKitFeatures.cmake, only use ${_name} for condition to print
+ a option as ON will prevent the overridden ones in OptionsXXX.cmake,
+ should use ${_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name}} instead.
+
+ * Source/cmake/OptionsEfl.cmake: Turn on ENABLE_3D_RENDERING and
+ ENABLE_WEBGL
+ * Source/cmake/WebKitFeatures.cmake: Use
+ ${_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name}} to as value of
+ a feature is enabled. Adjust options in lexicographical order.
+
2012-11-26 Kalev Lember <[email protected]>
[GTK] Explicitly link against librt
Modified: trunk/Source/cmake/OptionsEfl.cmake (135812 => 135813)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-11-27 04:30:26 UTC (rev 135812)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-11-27 04:37:01 UTC (rev 135813)
@@ -40,6 +40,7 @@
SET(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
WEBKIT_OPTION_BEGIN()
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ANIMATION_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
@@ -81,6 +82,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_INTENTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_INTENTS_TAG ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WORKERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (135812 => 135813)
--- trunk/Source/cmake/WebKitFeatures.cmake 2012-11-27 04:30:26 UTC (rev 135812)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2012-11-27 04:37:01 UTC (rev 135813)
@@ -11,10 +11,10 @@
ENDMACRO ()
MACRO (WEBKIT_OPTION_BEGIN)
- WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ANIMATION_API "Toggle animation API support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggel Assembler WX Exclusive support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_BATTERY_STATUS "Toggle battery status API support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_BLOB "Toggle Blob support" OFF)
@@ -115,12 +115,12 @@
WEBKIT_OPTION_DEFINE(ENABLE_VIBRATION "Toggle Vibration API support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_VIDEO "Toggle Video support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_INTENTS "Toggle Web Intents support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_INTENTS_TAG "Toogle HTMLIntentElement tag support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WORKERS "Toggle Web Workers support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
@@ -166,11 +166,9 @@
IF (${_name})
LIST(APPEND FEATURE_DEFINES ${_name})
SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_name}")
- SET(_MESSAGE "${_MESSAGE} ON")
- ELSE ()
- SET(_MESSAGE "${_MESSAGE} OFF")
ENDIF ()
+ SET(_MESSAGE "${_MESSAGE} ${_WEBKIT_AVAILABLE_OPTIONS_INITALVALUE_${_name}}")
MESSAGE(STATUS "${_MESSAGE}")
ENDFOREACH ()
ENDMACRO ()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
