Changeset 170751 in webkit
- Timestamp:
- Jul 3, 2014 6:36:45 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r170749 r170751 1 2014-07-03 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] The list of features shown by cmake is not accurate 4 https://bugs.webkit.org/show_bug.cgi?id=134588 5 6 Reviewed by Gustavo Noronha Silva. 7 8 The problem is that some options might change after the feature 9 list has been printed. 10 11 * Source/cmake/OptionsGTK.cmake: Find package dependencies before 12 setting the default values of features and set WEBGL value 13 depending on the dependencies, and API_TEST depending on whether 14 developer mode is enabled or not. 15 1 16 2014-07-03 Ryuan Choi <ryuan.choi@samsung.com> 2 17 -
trunk/Source/cmake/OptionsGTK.cmake
r170749 r170751 15 15 set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.") 16 16 17 find_package(Cairo 1.10.2 REQUIRED) 18 find_package(Fontconfig 2.8.0 REQUIRED) 19 find_package(Freetype2 2.4.2 REQUIRED) 20 find_package(GTK2 2.24.10 REQUIRED) 21 find_package(GDK2 2.24.10 REQUIRED) 22 find_package(HarfBuzz 0.9.2 REQUIRED) 23 find_package(ICU REQUIRED) 24 find_package(JPEG REQUIRED) 25 find_package(LibSoup 2.40.3 REQUIRED) 26 find_package(LibXml2 2.8.0 REQUIRED) 27 find_package(LibXslt 1.1.7 REQUIRED) 28 find_package(PNG REQUIRED) 29 find_package(Sqlite REQUIRED) 30 find_package(Threads REQUIRED) 31 find_package(ZLIB REQUIRED) 32 find_package(ATK REQUIRED) 33 find_package(WebP REQUIRED) 34 find_package(ATSPI 2.5.3) 35 find_package(GObjectIntrospection) 36 find_package(OpenGL) 37 find_package(EGL) 38 39 WEBKIT_OPTION_BEGIN() 40 if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND)) 41 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON) 42 endif () 43 44 if (DEVELOPER_MODE) 45 set(ENABLE_TOOLS ON) 46 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON) 47 else () 48 set(ENABLE_TOOLS OFF) 49 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF) 50 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter") 51 endif () 52 17 53 # FIXME: We want to expose fewer options to downstream, but for now everything is public. 18 WEBKIT_OPTION_BEGIN()19 54 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON) 20 55 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON) 21 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)22 56 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF) 23 57 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON) … … 62 96 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO ON) 63 97 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON) 64 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)65 98 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON) 66 99 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON) 67 100 WEBKIT_OPTION_DEFAULT_PORT_VALUE(WTF_USE_TILED_BACKING_STORE OFF) 101 WEBKIT_OPTION_END() 68 102 69 103 set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.") … … 81 115 add_definitions(-DWTF_PLATFORM_WAYLAND=1) 82 116 endif () 83 84 if (DEVELOPER_MODE)85 set(ENABLE_TOOLS ON)86 set(ENABLE_API_TESTS ON)87 else ()88 set(ENABLE_TOOLS OFF)89 set(ENABLE_API_TESTS OFF)90 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")91 endif ()92 93 WEBKIT_OPTION_END()94 117 95 118 set(ENABLE_WEBCORE ON) … … 151 174 endif () 152 175 153 find_package(Cairo 1.10.2 REQUIRED)154 find_package(Fontconfig 2.8.0 REQUIRED)155 find_package(Freetype2 2.4.2 REQUIRED)156 find_package(GTK2 2.24.10 REQUIRED)157 find_package(GDK2 2.24.10 REQUIRED)158 find_package(HarfBuzz 0.9.2 REQUIRED)159 find_package(ICU REQUIRED)160 find_package(JPEG REQUIRED)161 find_package(LibSoup 2.40.3 REQUIRED)162 find_package(LibXml2 2.8.0 REQUIRED)163 find_package(LibXslt 1.1.7 REQUIRED)164 find_package(PNG REQUIRED)165 find_package(Sqlite REQUIRED)166 find_package(Threads REQUIRED)167 find_package(ZLIB REQUIRED)168 find_package(ATK REQUIRED)169 find_package(WebP REQUIRED)170 find_package(ATSPI 2.5.3)171 find_package(GObjectIntrospection)172 173 176 if (ENABLE_WAYLAND_TARGET) 174 177 set(GTK3_REQUIRED_VERSION 3.12.0) … … 209 212 set(ENABLE_CREDENTIAL_STORAGE 1) 210 213 endif () 211 212 find_package(OpenGL)213 214 214 215 # This part can be simplified once CMake 2.8.6 is required and … … 228 229 endif () 229 230 230 find_package(EGL)231 231 if (EGL_FOUND) 232 232 set(WTF_USE_EGL 1) … … 238 238 239 239 if (OPENGL_FOUND AND (GLX_FOUND OR EGL_FOUND)) 240 set(ENABLE_WEBGL 1)241 240 set(ENABLE_TEXTURE_MAPPER 1) 242 241 set(WTF_USE_3D_GRAPHICS 1)
Note: See TracChangeset
for help on using the changeset viewer.