Changeset 161311 in webkit


Ignore:
Timestamp:
Jan 4, 2014 9:46:06 AM (10 years ago)
Author:
Martin Robinson
Message:

[GTK] [CMake] Improve the way we locate gobject-introspection
https://bugs.webkit.org/show_bug.cgi?id=126452

Reviewed by Philippe Normand.

.:

  • Source/cmake/FindGObjectIntrospection.cmake: Added.
  • Source/cmake/OptionsGTK.cmake: Load the new FindGObjectIntrospection file.

Source/JavaScriptCore:

  • PlatformGTK.cmake: Use the new introspection variables.

Source/WebKit:

  • PlatformGTK.cmake: Use the new introspection variables.

Source/WebKit2:

  • PlatformGTK.cmake: Use the new introspection variables.
Location:
trunk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r161310 r161311  
     12014-01-04  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Improve the way we locate gobject-introspection
     4        https://bugs.webkit.org/show_bug.cgi?id=126452
     5
     6        Reviewed by Philippe Normand.
     7
     8        * Source/cmake/FindGObjectIntrospection.cmake: Added.
     9        * Source/cmake/OptionsGTK.cmake: Load the new  FindGObjectIntrospection file.
     10
    1112014-01-04  Martin Robinson  <mrobinson@igalia.com>
    212
  • trunk/Source/JavaScriptCore/ChangeLog

    r161309 r161311  
     12014-01-04  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Improve the way we locate gobject-introspection
     4        https://bugs.webkit.org/show_bug.cgi?id=126452
     5
     6        Reviewed by Philippe Normand.
     7
     8        * PlatformGTK.cmake: Use the new introspection variables.
     9
    1102014-01-04  Zan Dobersek  <zdobersek@igalia.com>
    211
  • trunk/Source/JavaScriptCore/PlatformGTK.cmake

    r161144 r161311  
    55    OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
    66    DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
    7     COMMAND g-ir-compiler ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
     7    COMMAND ${INTROSPECTION_COMPILER} ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
    88)
    99
  • trunk/Source/WebKit/ChangeLog

    r161282 r161311  
     12014-01-04  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Improve the way we locate gobject-introspection
     4        https://bugs.webkit.org/show_bug.cgi?id=126452
     5
     6        Reviewed by Philippe Normand.
     7
     8        * PlatformGTK.cmake: Use the new introspection variables.
     9
    1102014-01-03  Simon Fraser  <simon.fraser@apple.com>
    211
  • trunk/Source/WebKit/PlatformGTK.cmake

    r161144 r161311  
    166166    DEPENDS JavaScriptCore-3-gir
    167167    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
    168         g-ir-scanner
     168        ${INTROSPECTION_SCANNER}
    169169        --quiet
    170170        --warn-all
     
    203203    OUTPUT ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
    204204    DEPENDS ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
    205     COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
     205    COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
    206206)
    207207
  • trunk/Source/WebKit2/ChangeLog

    r161309 r161311  
     12014-01-04  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Improve the way we locate gobject-introspection
     4        https://bugs.webkit.org/show_bug.cgi?id=126452
     5
     6        Reviewed by Philippe Normand.
     7
     8        * PlatformGTK.cmake: Use the new introspection variables.
     9
    1102014-01-04  Zan Dobersek  <zdobersek@igalia.com>
    211
  • trunk/Source/WebKit2/PlatformGTK.cmake

    r161156 r161311  
    652652    DEPENDS JavaScriptCore-3-gir
    653653    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
    654         g-ir-scanner
     654        ${INTROSPECTION_SCANNER}
    655655        --quiet
    656656        --warn-all
     
    691691    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
    692692    COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
    693         g-ir-scanner
     693        ${INTROSPECTION_SCANNER}
    694694        --quiet
    695695        --warn-all
     
    732732    OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
    733733    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
    734     COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
     734    COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
    735735)
    736736
     
    738738    OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
    739739    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
    740     COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
     740    COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
    741741)
    742742
  • trunk/Source/cmake/OptionsGTK.cmake

    r161310 r161311  
    169169find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
    170170find_package(ATSPI 2.5.3)
     171find_package(GObjectIntrospection)
    171172
    172173# We don't use find_package for GLX because it is part of -lGL, unlike EGL.
Note: See TracChangeset for help on using the changeset viewer.