Changeset 138681 in webkit


Ignore:
Timestamp:
Jan 2, 2013 5:00:35 PM (11 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

[EFL][CMAKE] Remove duplicated conditionals
​https://bugs.webkit.org/show_bug.cgi?id=105905

Reviewed by Laszlo Gombos.

.:

  • Source/cmake/OptionsEfl.cmake: Remove set(WTF_USE_GLX 1).

Source/WebCore:

Remove conditionals from CMake build system, where the files being built are already wrapped with
the conditionals. It just messes cmake file up.

  • PlatformEfl.cmake:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r138678 r138681  
     12013-01-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        [EFL][CMAKE] Remove duplicated conditionals
     4        https://bugs.webkit.org/show_bug.cgi?id=105905
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * Source/cmake/OptionsEfl.cmake: Remove set(WTF_USE_GLX 1).
     9
    1102013-01-02  Tony Chang  <tony@chromium.org>
    211

  • trunk/Source/WebCore/ChangeLog

    r138679 r138681  
     12013-01-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        [EFL][CMAKE] Remove duplicated conditionals
     4        https://bugs.webkit.org/show_bug.cgi?id=105905
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        Remove conditionals from CMake build system, where the files being built are already wrapped with
     9        the conditionals. It just messes cmake file up.
     10
     11        * PlatformEfl.cmake:
     12
    1132013-01-02  Alexey Proskuryakov  <ap@apple.com>
    214

  • trunk/Source/WebCore/PlatformEfl.cmake

    r138598 r138681  
    1616
    1717list(APPEND WebCore_SOURCES
     18    accessibility/atk/AccessibilityObjectAtk.cpp
     19    accessibility/atk/AXObjectCacheAtk.cpp
     20    accessibility/atk/WebKitAccessibleHyperlink.cpp
     21    accessibility/atk/WebKitAccessibleInterfaceAction.cpp
     22    accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
     23    accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
     24    accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
     25    accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
     26    accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
     27    accessibility/atk/WebKitAccessibleInterfaceImage.cpp
     28    accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
     29    accessibility/atk/WebKitAccessibleInterfaceTable.cpp
     30    accessibility/atk/WebKitAccessibleInterfaceText.cpp
     31    accessibility/atk/WebKitAccessibleInterfaceValue.cpp
     32    accessibility/atk/WebKitAccessibleUtil.cpp
     33    accessibility/atk/WebKitAccessibleWrapperAtk.cpp
     34
    1835    editing/SmartReplaceICU.cpp
     36
    1937    page/efl/DragControllerEfl.cpp
    2038    page/efl/EventHandlerEfl.cpp
     39
    2140    platform/cairo/WidgetBackingStoreCairo.cpp
     41
    2242    platform/Cursor.cpp
     43
     44    platform/audio/efl/AudioBusEfl.cpp
     45    platform/audio/gstreamer/AudioDestinationGStreamer.cpp
     46    platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
     47    platform/audio/gstreamer/FFTFrameGStreamer.cpp
     48    platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
     49
    2350    platform/efl/AsyncFileSystemEfl.cpp
    2451    platform/efl/BatteryProviderEfl.cpp
    … …  
    90117    platform/graphics/freetype/SimpleFontDataFreeType.cpp
    91118
     119    platform/graphics/gstreamer/GRefPtrGStreamer.cpp
     120    platform/graphics/gstreamer/GStreamerGWorld.cpp
     121    platform/graphics/gstreamer/GStreamerUtilities.cpp
     122    platform/graphics/gstreamer/GStreamerVersioning.cpp
     123    platform/graphics/gstreamer/ImageGStreamerCairo.cpp
     124    platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
     125    platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
     126    platform/graphics/gstreamer/VideoSinkGStreamer.cpp
     127    platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
     128
    92129    platform/graphics/harfbuzz/HarfBuzzShaperBase.cpp
    93130    platform/graphics/harfbuzz/ng/HarfBuzzNGFaceCairo.cpp
    … …  
    95132    platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp
    96133
     134    platform/graphics/surfaces/glx/GLXContext.cpp
     135    platform/graphics/surfaces/glx/GLXSurface.cpp
     136
    97137    platform/graphics/WOFFFileFormat.cpp
     138
    98139    platform/image-decoders/cairo/ImageDecoderCairo.cpp
     140
    99141    platform/linux/GamepadDeviceLinux.cpp
     142
    100143    platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
     144
    101145    platform/network/efl/NetworkStateNotifierEfl.cpp
    102146
    … …  
    117161
    118162    platform/PlatformStrategies.cpp
     163
    119164    platform/posix/FileSystemPOSIX.cpp
    120165    platform/posix/SharedBufferPOSIX.cpp
     166
    121167    platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
    122168    platform/text/enchant/TextCheckerEnchant.cpp
    … …  
    223269        ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
    224270    )
    225     list(APPEND WebCore_SOURCES
    226         platform/graphics/gstreamer/GRefPtrGStreamer.cpp
    227         platform/graphics/gstreamer/GStreamerUtilities.cpp
    228         platform/graphics/gstreamer/GStreamerVersioning.cpp
    229     )
     271
    230272    list(APPEND WebCore_LIBRARIES
    231273        ${GSTREAMER_LIBRARIES}
    … …  
    242284    list(APPEND WebCore_INCLUDE_DIRECTORIES
    243285        ${GSTREAMER_VIDEO_INCLUDE_DIRS}
    244     )
    245     list(APPEND WebCore_SOURCES
    246         platform/graphics/gstreamer/GStreamerGWorld.cpp
    247         platform/graphics/gstreamer/ImageGStreamerCairo.cpp
    248         platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
    249         platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
    250         platform/graphics/gstreamer/VideoSinkGStreamer.cpp
    251         platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
    252286    )
    253287    list(APPEND WebCore_LIBRARIES
    … …  
    297331    endif ()
    298332
    299     if (WTF_USE_GLX)
    300         list(APPEND WebCore_SOURCES
    301             platform/graphics/surfaces/glx/GLXSurface.cpp
    302             platform/graphics/surfaces/glx/GLXContext.cpp
    303         )
    304     endif ()
    305 
    306333    if (WTF_USE_OPENGL_ES_2)
    307334        list(APPEND WebCore_SOURCES
    … …  
    338365        ${GSTREAMER_FFT_INCLUDE_DIRS}
    339366    )
    340     list(APPEND WebCore_SOURCES
    341         platform/audio/efl/AudioBusEfl.cpp
    342         platform/audio/gstreamer/AudioDestinationGStreamer.cpp
    343         platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
    344         platform/audio/gstreamer/FFTFrameGStreamer.cpp
    345         platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
    346     )
    347367    list(APPEND WebCore_LIBRARIES
    348368        ${GSTREAMER_AUDIO_LIBRARIES}
    … …  
    365385
    366386if (ENABLE_ACCESSIBILITY)
    367     list(APPEND WebCore_SOURCES
    368         accessibility/atk/AccessibilityObjectAtk.cpp
    369         accessibility/atk/AXObjectCacheAtk.cpp
    370         accessibility/atk/WebKitAccessibleHyperlink.cpp
    371         accessibility/atk/WebKitAccessibleInterfaceAction.cpp
    372         accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
    373         accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
    374         accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
    375         accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
    376         accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
    377         accessibility/atk/WebKitAccessibleInterfaceImage.cpp
    378         accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
    379         accessibility/atk/WebKitAccessibleInterfaceTable.cpp
    380         accessibility/atk/WebKitAccessibleInterfaceText.cpp
    381         accessibility/atk/WebKitAccessibleInterfaceValue.cpp
    382         accessibility/atk/WebKitAccessibleUtil.cpp
    383         accessibility/atk/WebKitAccessibleWrapperAtk.cpp
    384     )
    385387    list(APPEND WebCore_INCLUDE_DIRECTORIES
    386388        "${WEBCORE_DIR}/accessibility/atk"

  • trunk/Source/cmake/OptionsEfl.cmake

    r138605 r138681  
    200200        endif ()
    201201     elseif (OPENGLX_FOUND)
    202          set(WTF_USE_GLX 1)
    203202         add_definitions(-DWTF_USE_GLX=1)
    204203    endif ()
Note: See TracChangeset for help on using the changeset viewer.