Changeset 170751 in webkit

Timestamp:

Jul 3, 2014 6:36:45 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] The list of features shown by cmake is not accurate
​https://bugs.webkit.org/show_bug.cgi?id=134588

Reviewed by Gustavo Noronha Silva.

The problem is that some options might change after the feature
list has been printed.

• Source/cmake/OptionsGTK.cmake: Find package dependencies before

setting the default values of features and set WEBGL value
depending on the dependencies, and API_TEST depending on whether
developer mode is enabled or not.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (7 diffs)

trunk/ChangeLog

@@ +1 @@
+2014-07-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] The list of features shown by cmake is not accurate
+        https://bugs.webkit.org/show_bug.cgi?id=134588
+
+        Reviewed by Gustavo Noronha Silva.
+
+        The problem is that some options might change after the feature
+        list has been printed.
+
+        * Source/cmake/OptionsGTK.cmake: Find package dependencies before
+        setting the default values of features and set WEBGL value
+        depending on the dependencies, and API_TEST depending on whether
+        developer mode is enabled or not.
+
 2014-07-03  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -15 +15 @@
 set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
 
+find_package(Cairo 1.10.2 REQUIRED)
+find_package(Fontconfig 2.8.0 REQUIRED)
+find_package(Freetype2 2.4.2 REQUIRED)
+find_package(GTK2 2.24.10 REQUIRED)
+find_package(GDK2 2.24.10 REQUIRED)
+find_package(HarfBuzz 0.9.2 REQUIRED)
+find_package(ICU REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(LibSoup 2.40.3 REQUIRED)
+find_package(LibXml2 2.8.0 REQUIRED)
+find_package(LibXslt 1.1.7 REQUIRED)
+find_package(PNG REQUIRED)
+find_package(Sqlite REQUIRED)
+find_package(Threads REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(ATK REQUIRED)
+find_package(WebP REQUIRED)
+find_package(ATSPI 2.5.3)
+find_package(GObjectIntrospection)
+find_package(OpenGL)
+find_package(EGL)
+
+WEBKIT_OPTION_BEGIN()
+if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
+      WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
+endif ()
+
+if (DEVELOPER_MODE)
+    set(ENABLE_TOOLS ON)
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
+else ()
+    set(ENABLE_TOOLS OFF)
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
+    set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")
+endif ()
+
 # FIXME: We want to expose fewer options to downstream, but for now everything is public.
-WEBKIT_OPTION_BEGIN()
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
@@ -62 +96 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF)
+WEBKIT_OPTION_END()
 
 set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
@@ -81 +115 @@
     add_definitions(-DWTF_PLATFORM_WAYLAND=1)
 endif ()
-
-if (DEVELOPER_MODE)
-    set(ENABLE_TOOLS ON)
-    set(ENABLE_API_TESTS ON)
-else ()
-    set(ENABLE_TOOLS OFF)
-    set(ENABLE_API_TESTS OFF)
-    set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")
-endif ()
-
-WEBKIT_OPTION_END()
 
 set(ENABLE_WEBCORE ON)
@@ -151 +174 @@
 endif ()
 
-find_package(Cairo 1.10.2 REQUIRED)
-find_package(Fontconfig 2.8.0 REQUIRED)
-find_package(Freetype2 2.4.2 REQUIRED)
-find_package(GTK2 2.24.10 REQUIRED)
-find_package(GDK2 2.24.10 REQUIRED)
-find_package(HarfBuzz 0.9.2 REQUIRED)
-find_package(ICU REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(LibSoup 2.40.3 REQUIRED)
-find_package(LibXml2 2.8.0 REQUIRED)
-find_package(LibXslt 1.1.7 REQUIRED)
-find_package(PNG REQUIRED)
-find_package(Sqlite REQUIRED)
-find_package(Threads REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(ATK REQUIRED)
-find_package(WebP REQUIRED)
-find_package(ATSPI 2.5.3)
-find_package(GObjectIntrospection)
-
 if (ENABLE_WAYLAND_TARGET)
     set(GTK3_REQUIRED_VERSION 3.12.0)
@@ -209 +212 @@
     set(ENABLE_CREDENTIAL_STORAGE 1)
 endif ()
-
-find_package(OpenGL)
 
 # This part can be simplified once CMake 2.8.6 is required and
@@ -228 +229 @@
 endif ()
 
-find_package(EGL)
 if (EGL_FOUND)
     set(WTF_USE_EGL 1)
@@ -238 +238 @@
 
 if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND))
-    set(ENABLE_WEBGL 1)
     set(ENABLE_TEXTURE_MAPPER 1)
     set(WTF_USE_3D_GRAPHICS 1)