Changeset 161351 in webkit


Ignore:
Timestamp:
Jan 6, 2014 10:33:15 AM (10 years ago)
Author:
Martin Robinson
Message:

[CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
​https://bugs.webkit.org/show_bug.cgi?id=126505

Reviewed by Gustavo Noronha Silva.

.:

  • Source/cmake/FindGLIB.cmake: Add support for finding the gio-unix include directory location.
  • Source/cmake/FindGUdev.cmake: Added.
  • Source/cmake/FindGeoClue.cmake: Added.
  • Source/cmake/OptionsGTK.cmake: When gamepad is enabled look for gio-unix and GUdev. When

geolocation is enabled look for GeoClue.

Source/WebCore:

  • CMakeLists.txt: Add missing IDLS and source files to the lists.
  • PlatformGTK.cmake: Add missing include directories and source files to the lists.

Use the GeoClue, GUdev, and gio-unix include paths and libraries and sort the list
of WebCore include directories.

  • UseJSC.cmake: Align the sourced list with the contents of the bindings/js directory.

Source/WebKit:

  • PlatformGTK.cmake: Add the geoclue platform directory to the include directory list.
Location:
trunk
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r161333 r161351  
     12014-01-06  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
     4        https://bugs.webkit.org/show_bug.cgi?id=126505
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/cmake/FindGLIB.cmake: Add support for finding the gio-unix include directory location.
     9        * Source/cmake/FindGUdev.cmake: Added.
     10        * Source/cmake/FindGeoClue.cmake: Added.
     11        * Source/cmake/OptionsGTK.cmake: When gamepad is enabled look for gio-unix and GUdev. When
     12        geolocation is enabled look for GeoClue.
     13
    1142014-01-06  Zan Dobersek  <zdobersek@igalia.com>
    215

  • trunk/Source/WebCore/CMakeLists.txt

    r161271 r161351  
    550550    page/Location.idl
    551551    page/Navigator.idl
    552     page/Performance.idl
    553552    page/PerformanceEntry.idl
    554553    page/PerformanceEntryList.idl
     554    page/Performance.idl
     555    page/PerformanceMark.idl
     556    page/PerformanceMeasure.idl
    555557    page/PerformanceNavigation.idl
    556558    page/PerformanceResourceTiming.idl
    … …  
    831833    Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp
    832834
     835    Modules/mediasource/DOMURLMediaSource.cpp
    833836    Modules/mediasource/MediaSource.cpp
    834837    Modules/mediasource/MediaSourceRegistry.cpp
     838    Modules/mediasource/SampleMap.cpp
    835839    Modules/mediasource/SourceBuffer.cpp
    836840    Modules/mediasource/SourceBufferList.cpp
    … …  
    14121416    html/HTMLMarqueeElement.cpp
    14131417    html/HTMLMediaElement.cpp
     1418    html/HTMLMediaSource.cpp
    14141419    html/HTMLMenuElement.cpp
    14151420    html/HTMLMetaElement.cpp
    … …  
    17661771    page/PerformanceResourceTiming.cpp
    17671772    page/PerformanceTiming.cpp
     1773    page/PerformanceUserTiming.cpp
    17681774    page/PrintContext.cpp
    17691775    page/Screen.cpp
    … …  
    29993005    platform/mock/PlatformSpeechSynthesizerMock.cpp
    30003006
     3007    platform/mock/mediasource/MockBox.cpp
     3008    platform/mock/mediasource/MockMediaPlayerMediaSource.cpp
     3009    platform/mock/mediasource/MockMediaSourcePrivate.cpp
     3010    platform/mock/mediasource/MockSourceBufferPrivate.cpp
     3011    platform/mock/mediasource/MockTracks.cpp
     3012
    30013013    testing/InternalSettings.cpp
    30023014    testing/Internals.cpp

  • trunk/Source/WebCore/ChangeLog

    r161350 r161351  
     12014-01-06  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
     4        https://bugs.webkit.org/show_bug.cgi?id=126505
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * CMakeLists.txt: Add missing IDLS and source files to the lists.
     9        * PlatformGTK.cmake: Add missing include directories and source files to the lists.
     10        Use the GeoClue, GUdev, and gio-unix include paths and libraries and sort the list
     11        of WebCore include directories.
     12        * UseJSC.cmake: Align the sourced list with the contents of the bindings/js directory.
     13
    1142014-01-06  Gavin Barraclough  <barraclough@apple.com>
    215

  • trunk/Source/WebCore/PlatformGTK.cmake

    r161325 r161351  
    44    "${WEBCORE_DIR}/page/gtk"
    55    "${WEBCORE_DIR}/platform/cairo"
     6    "${WEBCORE_DIR}/platform/geoclue"
    67    "${WEBCORE_DIR}/platform/gtk"
    78    "${WEBCORE_DIR}/platform/graphics/cairo"
    … …  
    1617    "${WEBCORE_DIR}/platform/linux"
    1718    "${WEBCORE_DIR}/platform/mediastream/gstreamer"
     19    "${WEBCORE_DIR}/platform/mock/mediasource"
    1820    "${WEBCORE_DIR}/platform/network/gtk"
    1921    "${WEBCORE_DIR}/platform/network/soup"
    … …  
    3739    platform/audio/gstreamer/FFTFrameGStreamer.cpp
    3840    platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
     41
     42    platform/geoclue/GeolocationProviderGeoclue.cpp
    3943
    4044    platform/graphics/GraphicsContext3DPrivate.cpp
    … …  
    97101    platform/graphics/opentype/OpenTypeVerticalData.cpp
    98102
     103    platform/gtk/GamepadsGtk.cpp
     104
    99105    platform/image-decoders/cairo/ImageDecoderCairo.cpp
    100106
    … …  
    188194    platform/gtk/GOwnPtrGtk.cpp
    189195    platform/gtk/GRefPtrGtk.cpp
    190     platform/gtk/GamepadsGtk.cpp
    191196    platform/gtk/GtkClickCounter.cpp
    192197    platform/gtk/GtkDragAndDropHelper.cpp
    … …  
    291296    ${FONTCONFIG_LIBRARIES}
    292297    ${FREETYPE_LIBRARIES}
     298    ${GEOCLUE_LIBRARIES}
    293299    ${GLIB_GIO_LIBRARIES}
    294300    ${GLIB_GMODULE_LIBRARIES}
    295301    ${GLIB_GOBJECT_LIBRARIES}
    296302    ${GLIB_LIBRARIES}
     303    ${GUDEV_LIBRARIES}
    297304    ${HARFBUZZ_LIBRARIES}
    298305    ${ICU_LIBRARIES}
    … …  
    314321list(APPEND WebCore_INCLUDE_DIRECTORIES
    315322    ${ATK_INCLUDE_DIRS}
     323    ${CAIRO_INCLUDE_DIRS}
    316324    ${ENCHANT_INCLUDE_DIRS}
    317     ${CAIRO_INCLUDE_DIRS}
    318325    ${FREETYPE_INCLUDE_DIRS}
     326    ${GEOCLUE_INCLUDE_DIRS}
     327    ${GIO_UNIX_INCLUDE_DIRS}
     328    ${GLIB_INCLUDE_DIRS}
     329    ${GUDEV_INCLUDE_DIRS}
     330    ${HARFBUZZ_INCLUDE_DIRS}
    319331    ${ICU_INCLUDE_DIRS}
     332    ${LIBSOUP_INCLUDE_DIRS}
    320333    ${LIBXML2_INCLUDE_DIR}
    321334    ${LIBXSLT_INCLUDE_DIR}
    322335    ${SQLITE_INCLUDE_DIR}
    323     ${GLIB_INCLUDE_DIRS}
    324     ${LIBSOUP_INCLUDE_DIRS}
    325     ${ZLIB_INCLUDE_DIRS}
    326     ${HARFBUZZ_INCLUDE_DIRS}
    327336    ${WEBP_INCLUDE_DIRS}
    328337    ${XT_INCLUDE_DIRS}
     338    ${ZLIB_INCLUDE_DIRS}
    329339)
    330340

  • trunk/Source/WebCore/UseJSC.cmake

    r160946 r161351  
    2929    bindings/js/Dictionary.cpp
    3030    bindings/js/GCController.cpp
     31    bindings/js/IDBBindingUtilities.cpp
    3132    bindings/js/JSAttrCustom.cpp
     33    bindings/js/JSAudioBufferSourceNodeCustom.cpp
     34    bindings/js/JSAudioContextCustom.cpp
     35    bindings/js/JSAudioTrackCustom.cpp
     36    bindings/js/JSAudioTrackListCustom.cpp
     37    bindings/js/JSBiquadFilterNodeCustom.cpp
    3238    bindings/js/JSBlobCustom.cpp
    3339    bindings/js/JSCDATASectionCustom.cpp
    … …  
    4147    bindings/js/JSClipboardCustom.cpp
    4248    bindings/js/JSCommandLineAPIHostCustom.cpp
     49    bindings/js/JSCryptoAlgorithmBuilder.cpp
     50    bindings/js/JSCryptoAlgorithmDictionary.cpp
    4351    bindings/js/JSCryptoCustom.cpp
     52    bindings/js/JSCryptoKeyCustom.cpp
     53    bindings/js/JSCryptoKeyPairCustom.cpp
     54    bindings/js/JSCryptoKeySerializationJWK.cpp
     55    bindings/js/JSCryptoOperationData.cpp
     56    bindings/js/JSCustomSQLStatementErrorCallback.cpp
    4457    bindings/js/JSCustomXPathNSResolver.cpp
    45     bindings/js/JSDictionary.cpp
    4658    bindings/js/JSDOMBinding.cpp
    4759    bindings/js/JSDOMFormDataCustom.cpp
    … …  
    5163    bindings/js/JSDOMPluginArrayCustom.cpp
    5264    bindings/js/JSDOMPluginCustom.cpp
     65    bindings/js/JSDOMPromise.cpp
    5366    bindings/js/JSDOMStringListCustom.cpp
    5467    bindings/js/JSDOMStringMapCustom.cpp
    … …  
    5770    bindings/js/JSDOMWindowShell.cpp
    5871    bindings/js/JSDOMWrapper.cpp
     72    bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
    5973    bindings/js/JSDeviceMotionEventCustom.cpp
    6074    bindings/js/JSDeviceOrientationEventCustom.cpp
     75    bindings/js/JSDictionary.cpp
    6176    bindings/js/JSDocumentCustom.cpp
    6277    bindings/js/JSElementCustom.cpp
    … …  
    6681    bindings/js/JSEventTargetCustom.cpp
    6782    bindings/js/JSExceptionBase.cpp
     83    bindings/js/JSFileReaderCustom.cpp
    6884    bindings/js/JSGeolocationCustom.cpp
    6985    bindings/js/JSHTMLAllCollectionCustom.cpp
    … …  
    86102    bindings/js/JSHTMLTemplateElementCustom.cpp
    87103    bindings/js/JSHistoryCustom.cpp
     104    bindings/js/JSIDBAnyCustom.cpp
     105    bindings/js/JSIDBDatabaseCustom.cpp
     106    bindings/js/JSIDBObjectStoreCustom.cpp
    88107    bindings/js/JSImageConstructor.cpp
    89108    bindings/js/JSImageDataCustom.cpp
    … …  
    95114    bindings/js/JSLocationCustom.cpp
    96115    bindings/js/JSMainThreadExecState.cpp
     116    bindings/js/JSMediaSourceStatesCustom.cpp
     117    bindings/js/JSMediaStreamCapabilitiesCustom.cpp
    97118    bindings/js/JSMessageChannelCustom.cpp
    98119    bindings/js/JSMessageEventCustom.cpp
    … …  
    106127    bindings/js/JSNodeIteratorCustom.cpp
    107128    bindings/js/JSNodeListCustom.cpp
     129    bindings/js/JSOscillatorNodeCustom.cpp
     130    bindings/js/JSPannerNodeCustom.cpp
     131    bindings/js/JSPerformanceEntryCustom.cpp
    108132    bindings/js/JSPluginElementFunctions.cpp
    109133    bindings/js/JSPopStateEventCustom.cpp
     134    bindings/js/JSRTCIceCandidateCustom.cpp
     135    bindings/js/JSRTCPeerConnectionCustom.cpp
     136    bindings/js/JSRTCSessionDescriptionCustom.cpp
     137    bindings/js/JSRTCStatsResponseCustom.cpp
     138    bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
     139    bindings/js/JSSQLResultSetRowListCustom.cpp
     140    bindings/js/JSSQLTransactionCustom.cpp
     141    bindings/js/JSSQLTransactionSyncCustom.cpp
     142    bindings/js/JSSVGElementInstanceCustom.cpp
     143    bindings/js/JSSVGLengthCustom.cpp
     144    bindings/js/JSSVGPathSegCustom.cpp
     145    bindings/js/JSSharedWorkerCustom.cpp
    110146    bindings/js/JSStorageCustom.cpp
    111147    bindings/js/JSStyleSheetCustom.cpp
    112148    bindings/js/JSStyleSheetListCustom.cpp
     149    bindings/js/JSSubtleCryptoCustom.cpp
    113150    bindings/js/JSTextCustom.cpp
     151    bindings/js/JSTextTrackCueCustom.cpp
     152    bindings/js/JSTextTrackCustom.cpp
     153    bindings/js/JSTextTrackListCustom.cpp
    114154    bindings/js/JSTouchCustom.cpp
    115155    bindings/js/JSTouchListCustom.cpp
     156    bindings/js/JSTrackCustom.cpp
     157    bindings/js/JSTrackEventCustom.cpp
    116158    bindings/js/JSTreeWalkerCustom.cpp
     159    bindings/js/JSVideoTrackCustom.cpp
     160    bindings/js/JSVideoTrackListCustom.cpp
     161    bindings/js/JSWebGLRenderingContextCustom.cpp
    117162    bindings/js/JSWebKitPointCustom.cpp
     163    bindings/js/JSWorkerCustom.cpp
     164    bindings/js/JSWorkerGlobalScopeBase.cpp
     165    bindings/js/JSWorkerGlobalScopeCustom.cpp
    118166    bindings/js/JSXMLHttpRequestCustom.cpp
    119167    bindings/js/JSXPathResultCustom.cpp
    … …  
    132180    bindings/js/SerializedScriptValue.cpp
    133181    bindings/js/WebCoreTypedArrayController.cpp
     182    bindings/js/WorkerScriptController.cpp
     183    bindings/js/WorkerScriptDebugServer.cpp
    134184
    135185    bridge/IdentifierRep.cpp

  • trunk/Source/WebKit/ChangeLog

    r161332 r161351  
     12014-01-06  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
     4        https://bugs.webkit.org/show_bug.cgi?id=126505
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * PlatformGTK.cmake: Add the geoclue platform directory to the include directory list.
     9
    1102014-01-06  Mark Rowe  <mrowe@apple.com>
    211

  • trunk/Source/WebKit/PlatformGTK.cmake

    r161325 r161351  
    1919    ${WEBCORE_DIR}/accessibility/atk
    2020    ${WEBCORE_DIR}/platform/cairo
     21    ${WEBCORE_DIR}/platform/geoclue
    2122    ${WEBCORE_DIR}/platform/graphics/cairo
    2223    ${WEBCORE_DIR}/platform/graphics/gtk

  • trunk/Source/cmake/FindGLIB.cmake

    r136790 r161351  
    9595        find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
    9696        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
     97    elseif (${_component} STREQUAL "gio-unix")
     98        # gio-unix is compiled as part of the gio library, but the include paths
     99        # are separate from the shared glib ones. Since this is currently only used
     100        # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
     101        pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
    97102    endif ()
    98103endforeach ()

  • trunk/Source/cmake/OptionsGTK.cmake

    r161325 r161351  
    153153find_package(Fontconfig 2.8.0 REQUIRED)
    154154find_package(Freetype 2.4.2 REQUIRED)
    155 find_package(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread gmodule)
    156155find_package(GTK3 3.6.0 REQUIRED)
    157156find_package(GDK3 3.6.0 REQUIRED)
    … …  
    175174find_package(GObjectIntrospection)
    176175
     176set(glib_components gio gobject gthread gmodule)
     177if (ENABLE_GAMEPAD)
     178    list(APPEND glib_components gio-unix)
     179endif ()
     180find_package(GLIB 2.33.2 REQUIRED COMPONENTS ${glib_components})
     181
     182if (ENABLE_GEOLOCATION)
     183    find_package(GeoClue)
     184endif ()
     185
    177186# We don't use find_package for GLX because it is part of -lGL, unlike EGL.
    178187find_package(OpenGL)
    … …  
    216225    set(WTF_USE_LEVELDB 1)
    217226    add_definitions(-DWTF_USE_LEVELDB=1)
     227endif ()
     228
     229if (ENABLE_GAMEPAD)
     230    find_package(GUdev)
    218231endif ()
    219232
Note: See TracChangeset for help on using the changeset viewer.