Changeset 161311 in webkit
- Timestamp:
- Jan 4, 2014 9:46:06 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r161310 r161311 1 2014-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 1 11 2014-01-04 Martin Robinson <mrobinson@igalia.com> 2 12 -
trunk/Source/JavaScriptCore/ChangeLog
r161309 r161311 1 2014-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 1 10 2014-01-04 Zan Dobersek <zdobersek@igalia.com> 2 11 -
trunk/Source/JavaScriptCore/PlatformGTK.cmake
r161144 r161311 5 5 OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib 6 6 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.typelib7 COMMAND ${INTROSPECTION_COMPILER} ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib 8 8 ) 9 9 -
trunk/Source/WebKit/ChangeLog
r161282 r161311 1 2014-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 1 10 2014-01-03 Simon Fraser <simon.fraser@apple.com> 2 11 -
trunk/Source/WebKit/PlatformGTK.cmake
r161144 r161311 166 166 DEPENDS JavaScriptCore-3-gir 167 167 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations 168 g-ir-scanner168 ${INTROSPECTION_SCANNER} 169 169 --quiet 170 170 --warn-all … … 203 203 OUTPUT ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib 204 204 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.typelib205 COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib 206 206 ) 207 207 -
trunk/Source/WebKit2/ChangeLog
r161309 r161311 1 2014-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 1 10 2014-01-04 Zan Dobersek <zdobersek@igalia.com> 2 11 -
trunk/Source/WebKit2/PlatformGTK.cmake
r161156 r161311 652 652 DEPENDS JavaScriptCore-3-gir 653 653 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations 654 g-ir-scanner654 ${INTROSPECTION_SCANNER} 655 655 --quiet 656 656 --warn-all … … 691 691 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir 692 692 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations 693 g-ir-scanner693 ${INTROSPECTION_SCANNER} 694 694 --quiet 695 695 --warn-all … … 732 732 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib 733 733 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.typelib734 COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib 735 735 ) 736 736 … … 738 738 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib 739 739 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.typelib740 COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib 741 741 ) 742 742 -
trunk/Source/cmake/OptionsGTK.cmake
r161310 r161311 169 169 find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS}) 170 170 find_package(ATSPI 2.5.3) 171 find_package(GObjectIntrospection) 171 172 172 173 # 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.