Changeset 149968 in webkit


Ignore:
Timestamp:
May 12, 2013 11:22:11 AM (11 years ago)
Author:
Martin Robinson
Message:

[GTK] Add a basic cmake build for WTF and JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=115967

Reviewed by Laszlo Gombos.

.:

  • CMakeLists.txt: Add GTK+ to the list of ports.
  • Source/CMakeLists.txt: We do not try to build WebCoreTestSupport when WebCore is disabled.
  • Source/cmake/FindGAIL3.cmake: Added.
  • Source/cmake/FindGDK3.cmake: Added.
  • Source/cmake/FindGStreamer.cmake: Use the passed in minimum version.
  • Source/cmake/FindGTK3.cmake: Added.
  • Source/cmake/FindXt.cmake: Added.
  • Source/cmake/OptionsEfl.cmake: Pass in the minimum version.
  • Source/cmake/OptionsGTK.cmake: Added.

Source/JavaScriptCore:

  • PlatformGTK.cmake: Added.
  • shell/PlatformGTK.cmake: Added.

Source/WTF:

  • wtf/PlatformGTK.cmake: Added.
Location:
trunk
Files:
8 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r147992 r149968  
    4040# Determine which port will be built
    4141# -----------------------------------------------------------------------------
    42 set(ALL_PORTS Efl WinCE BlackBerry)
     42set(ALL_PORTS Efl WinCE BlackBerry GTK)
    4343set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
    4444
  • trunk/ChangeLog

    r149966 r149968  
     12013-05-11  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Add a basic cmake build for WTF and JavaScriptCore
     4        https://bugs.webkit.org/show_bug.cgi?id=115967
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * CMakeLists.txt: Add GTK+ to the list of ports.
     9        * Source/CMakeLists.txt: We do not try to build WebCoreTestSupport when WebCore is disabled.
     10        * Source/cmake/FindGAIL3.cmake: Added.
     11        * Source/cmake/FindGDK3.cmake: Added.
     12        * Source/cmake/FindGStreamer.cmake: Use the passed in minimum version.
     13        * Source/cmake/FindGTK3.cmake: Added.
     14        * Source/cmake/FindXt.cmake: Added.
     15        * Source/cmake/OptionsEfl.cmake: Pass in the minimum version.
     16        * Source/cmake/OptionsGTK.cmake: Added.
     17
    1182013-05-11  Martin Robinson  <mrobinson@igalia.com>
    219
  • trunk/Source/CMakeLists.txt

    r136790 r149968  
    3333WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WTF_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
    3434WEBKIT_SET_EXTRA_COMPILER_FLAGS(${JavaScriptCore_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
    35 WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCoreTestSupport_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
    3635
    3736if (ENABLE_WEBCORE)
     37    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCoreTestSupport_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
    3838    WEBKIT_SET_EXTRA_COMPILER_FLAGS(${WebCore_LIBRARY_NAME} ${ADDITIONAL_FLAGS})
    3939endif ()
  • trunk/Source/JavaScriptCore/ChangeLog

    r149921 r149968  
     12013-05-11  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Add a basic cmake build for WTF and JavaScriptCore
     4        https://bugs.webkit.org/show_bug.cgi?id=115967
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * PlatformGTK.cmake: Added.
     9        * shell/PlatformGTK.cmake: Added.
     10
    1112013-05-10  Laszlo Gombos  <l.gombos@samsung.com>
    212
  • trunk/Source/WTF/ChangeLog

    r149966 r149968  
     12013-05-11  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Add a basic cmake build for WTF and JavaScriptCore
     4        https://bugs.webkit.org/show_bug.cgi?id=115967
     5
     6        Reviewed by Laszlo Gombos.
     7
     8        * wtf/PlatformGTK.cmake: Added.
     9
    1102013-05-11  Martin Robinson  <mrobinson@igalia.com>
    211
  • trunk/Source/cmake/FindGStreamer.cmake

    r139291 r149968  
    4848find_package(PkgConfig)
    4949
    50 # The minimum GStreamer version we support.
    51 set(GSTREAMER_MINIMUM_VERSION 1.0.5)
    52 
    5350# Helper macro to find a GStreamer plugin (or GStreamer itself)
    5451#   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_AUDIO")
     
    9996
    10097# FIXME: With CMake 2.8.3 we can just pass GSTREAMER_VERSION to FIND_PACKAGE_HANDLE_STANDARD_ARGS as VERSION_VAR
    101 #        and remove the version check here (GSTREAMER_MINIMUM_VERSION would be passed to FIND_PACKAGE).
     98#        and remove the version check here (GSTREAMER_FIND_VERSION would be passed to FIND_PACKAGE).
    10299set(VERSION_OK TRUE)
    103 if ("${GSTREAMER_VERSION}" VERSION_LESS "${GSTREAMER_MINIMUM_VERSION}")
    104     set(VERSION_OK FALSE)
     100if (GSTREAMER_FIND_VERSION_EXACT)
     101    if (NOT(("${GSTREAMER_FIND_VERSION}" VERSION_EQUAL "${GSTREAMER_VERSION}")))
     102        set(VERSION_OK FALSE)
     103    endif ()
     104else ()
     105    if ("${GSTREAMER_VERSION}" VERSION_LESS "${GSTREAMER_FIND_VERSION}")
     106        set(VERSION_OK FALSE)
     107    endif ()
    105108endif ()
    106109
  • trunk/Source/cmake/OptionsEfl.cmake

    r149596 r149968  
    179179    endif ()
    180180
    181     find_package(GStreamer REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
     181    find_package(GStreamer 1.0.5 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
    182182endif ()
    183183
Note: See TracChangeset for help on using the changeset viewer.