Changeset 150460 in webkit
- Timestamp:
- May 21, 2013 11:49:40 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r150445 r150460 1 2013-05-21 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] [CMake] Add support for building WebKit2 4 https://bugs.webkit.org/show_bug.cgi?id=116372 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * Source/cmake/FindWebP.cmake: Added. 9 * Source/cmake/OptionsGTK.cmake: Turn on WebKit2 and the plugin process and also look 10 for WebP. These missing symbols were hidden up until now. ENABLE_TEXTURE_MAPPER was 11 also incorrect specified. 12 1 13 2013-05-21 Zan Dobersek <zdobersek@igalia.com> 2 14 -
trunk/Source/WebCore/ChangeLog
r150454 r150460 1 2013-05-21 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] [CMake] Add support for building WebKit2 4 https://bugs.webkit.org/show_bug.cgi?id=116372 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * PlatformGTK.cmake: Add missing source files, include directories, and WebP properties. 9 1 10 2013-05-21 Jer Noble <jer.noble@apple.com> 2 11 -
trunk/Source/WebCore/PlatformGTK.cmake
r150189 r150460 6 6 "${WEBCORE_DIR}/platform/gtk" 7 7 "${WEBCORE_DIR}/platform/graphics/cairo" 8 "${WEBCORE_DIR}/platform/graphics/egl" 9 "${WEBCORE_DIR}/platform/graphics/glx" 8 10 "${WEBCORE_DIR}/platform/graphics/gtk" 9 11 "${WEBCORE_DIR}/platform/graphics/freetype" … … 115 117 platform/graphics/cairo/FontCairo.cpp 116 118 platform/graphics/cairo/FontCairoHarfbuzzNG.cpp 119 platform/graphics/cairo/GLContext.cpp 117 120 platform/graphics/cairo/GradientCairo.cpp 118 121 platform/graphics/cairo/GraphicsContext3DCairo.cpp … … 131 134 platform/graphics/cairo/TiledBackingStoreBackendCairo.cpp 132 135 platform/graphics/cairo/TransformationMatrixCairo.cpp 136 137 platform/graphics/egl/GLContextEGL.cpp 138 139 platform/graphics/glx/GLContextGLX.cpp 133 140 134 141 platform/graphics/gtk/ColorGtk.cpp … … 248 255 ${ZLIB_LIBRARIES} 249 256 ${HARFBUZZ_LIBRARIES} 257 ${WEBP_LIBRARIES} 250 258 ${XT_LIBRARIES} 251 259 ${X11_X11_LIB} … … 270 278 ${ZLIB_INCLUDE_DIRS} 271 279 ${HARFBUZZ_INCLUDE_DIRS} 280 ${WEBP_INCLUDE_DIRS} 272 281 ${XT_INCLUDE_DIRS} 273 282 ) -
trunk/Source/WebKit2/CMakeLists.txt
r150336 r150460 1 1 set(WebKit2_INCLUDE_DIRECTORIES 2 "${JAVASCRIPTCORE_DIR}/llint" 2 3 "${WEBKIT2_DIR}" 3 4 "${WEBKIT2_DIR}/Platform" … … 96 97 "${WEBCORE_DIR}/storage" 97 98 "${WEBCORE_DIR}/svg" 99 "${WEBCORE_DIR}/svg/graphics" 98 100 "${WEBCORE_DIR}/svg/properties" 99 101 "${JAVASCRIPTCORE_DIR}" … … 120 122 "${CMAKE_SOURCE_DIR}/Source" 121 123 ) 124 125 if (WTF_USE_3D_GRAPHICS) 126 list(APPEND WebKit2_INCLUDE_DIRECTORIES 127 "${THIRDPARTY_DIR}/ANGLE/include/KHR" 128 "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG" 129 ) 130 endif () 122 131 123 132 set(WebKit2_SOURCES … … 246 255 UIProcess/GeolocationPermissionRequestProxy.cpp 247 256 248 UIProcess/PageViewportController.cpp249 257 UIProcess/ResponsivenessTimer.cpp 250 258 UIProcess/StatisticsRequest.cpp … … 624 632 625 633 add_dependencies(WebKit2 WebCore) 626 add_dependencies(WebKit2 ${ForwardingHeaders_NAME}) 627 add_dependencies(WebKit2 ${ForwardingNetworkHeaders_NAME}) 634 add_dependencies(WebKit2 WEBKIT2_EXTRA_DEPENDENCIES) 628 635 target_link_libraries(WebKit2 ${WebKit2_LIBRARIES}) 629 636 set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit") -
trunk/Source/WebKit2/ChangeLog
r150445 r150460 1 2013-05-21 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] [CMake] Add support for building WebKit2 4 https://bugs.webkit.org/show_bug.cgi?id=116372 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * CMakeLists.txt: Add common directories to the common include list and remove UIProcess/PageViewportController.cpp 9 from the source list since it should only be compiled for WebKitEFL. Instead of taking explicit forwarding-header 10 dependencies accept a list of "tacked-on" dependencies for WebKit2. This allows GTK+ to specify its extra fake 11 installed header step. 12 * PlatformEfl.cmake: Remove common include directories and add UIProcess/PageViewportController.cpp to the source 13 list. Fix up forwarding header dependencies now. 14 * PlatformGTK.cmake: Added. 15 * config.h: First check whether this is a CMake build and then fall back to the autotools header. 16 1 17 2013-05-21 Zan Dobersek <zdobersek@igalia.com> 2 18 -
trunk/Source/WebKit2/PlatformEfl.cmake
r150336 r150460 42 42 43 43 UIProcess/DefaultUndoController.cpp 44 UIProcess/PageViewportController.cpp 44 45 45 46 Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp … … 178 179 179 180 list(APPEND WebKit2_INCLUDE_DIRECTORIES 180 "${JAVASCRIPTCORE_DIR}/llint"181 181 "${WEBCORE_DIR}/platform/efl" 182 182 "${WEBCORE_DIR}/platform/graphics/cairo" 183 183 "${WEBCORE_DIR}/platform/network/soup" 184 184 "${WEBCORE_DIR}/platform/text/enchant" 185 "${WEBCORE_DIR}/svg/graphics"186 185 "${WEBKIT2_DIR}/Shared/API/c/efl" 187 186 "${WEBKIT2_DIR}/Shared/Downloads/soup" … … 223 222 ) 224 223 225 if (WTF_USE_3D_GRAPHICS)226 list(APPEND WebKit2_INCLUDE_DIRECTORIES227 "${THIRDPARTY_DIR}/ANGLE/include/KHR"228 "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"229 )230 endif ()231 232 224 list(APPEND WebKit2_LIBRARIES 233 225 ${CAIRO_LIBRARIES} … … 296 288 COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include CoordinatedGraphics 297 289 ) 298 set(ForwardingHeaders_NAME forwarding-headerEfl)299 290 300 291 add_custom_target(forwarding-headerSoup 301 292 COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup 302 293 ) 303 set(ForwardingNetworkHeaders_NAME forwarding-headerSoup) 294 295 set(WEBKIT2_EXTRA_DEPENDENCIES 296 forwarding-headerEfl 297 forwarding-headerSoup 298 ) 304 299 305 300 configure_file(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @ONLY) -
trunk/Source/WebKit2/config.h
r147795 r150460 25 25 */ 26 26 27 #if defined (BUILDING_GTK__) 27 #if defined(BUILDING_WITH_CMAKE) 28 #include "cmakeconfig.h" 29 #elif defined(BUILDING_GTK__) 28 30 #include "autotoolsconfig.h" 29 #endif /* defined (BUILDING_GTK__) */30 31 #if defined (BUILDING_WITH_CMAKE)32 #include "cmakeconfig.h"33 31 #endif 34 32 -
trunk/Source/cmake/OptionsGTK.cmake
r150336 r150460 72 72 set(ENABLE_WEBCORE ON) 73 73 set(ENABLE_INSPECTOR ON) 74 set(ENABLE_PLUGIN_PROCESS O FF)74 set(ENABLE_PLUGIN_PROCESS ON) 75 75 set(ENABLE_WEBKIT OFF) 76 set(ENABLE_WEBKIT2 O FF)76 set(ENABLE_WEBKIT2 ON) 77 77 78 78 set(WTF_USE_ICU_UNICODE 1) … … 119 119 find_package(Xt REQUIRED) 120 120 find_package(ATK REQUIRED) 121 find_package(WebP REQUIRED) 121 122 find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS}) 122 123 … … 143 144 if (${OPENGL_FOUND} AND (${GLX_FOUND} OR ${EGL_FOUND})) 144 145 set(ENABLE_WEBGL 1) 145 set( WTF_USE_TEXTURE_MAPPER 1)146 set(ENABLE_TEXTURE_MAPPER 1) 146 147 set(WTF_USE_3D_GRAPHICS 1) 147 148 -
trunk/Tools/CMakeLists.txt
r138158 r150460 1 if (ENABLE_WEBKIT2 )1 if (ENABLE_WEBKIT2 AND NOT("${PORT}" STREQUAL "GTK")) 2 2 add_subdirectory(WebKitTestRunner) 3 3 endif () … … 16 16 endif () 17 17 add_subdirectory(DumpRenderTree/TestNetscapePlugIn) 18 elseif ("${PORT}" STREQUAL "GTK") 19 if (ENABLE_WEBKIT2) 20 add_subdirectory(MiniBrowser/gtk) 21 endif () 18 22 elseif ("${PORT}" STREQUAL "WinCE") 19 23 add_subdirectory(WinCELauncher) -
trunk/Tools/ChangeLog
r150457 r150460 1 2013-05-21 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] [CMake] Add support for building WebKit2 4 https://bugs.webkit.org/show_bug.cgi?id=116372 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * CMakeLists.txt: Do not build WebKitTestRunner yet for WebKitGTK+. 9 * MiniBrowser/gtk/CMakeLists.txt: Added. 10 1 11 2013-05-21 Jessie Berlin <jberlin@apple.com> 2 12
Note: See TracChangeset
for help on using the changeset viewer.