Title: [176391] releases/WebKitGTK/webkit-2.6
- Revision
- 176391
- Author
- [email protected]
- Date
- 2014-11-20 02:41:04 -0800 (Thu, 20 Nov 2014)
Log Message
Merge r175450 - REGRESSION(CMake): Make it possible to build without introspection
https://bugs.webkit.org/show_bug.cgi?id=138006
Reviewed by Philippe Normand.
.:
Add ENABLE_INTROSPECTION option.
* Source/PlatformGTK.cmake: Dot not add gir global target if
introspection is disabled.
* Source/cmake/OptionsGTK.cmake: Do not add gir individual targets if
introspection is disabled.
Source/_javascript_Core:
Do not install introspection files when introspection is disabled.
* PlatformGTK.cmake:
Source/WebKit2:
Do not install introspection files when introspection is disabled.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/ChangeLog (176390 => 176391)
--- releases/WebKitGTK/webkit-2.6/ChangeLog 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/ChangeLog 2014-11-20 10:41:04 UTC (rev 176391)
@@ -1,3 +1,17 @@
+2014-11-01 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(CMake): Make it possible to build without introspection
+ https://bugs.webkit.org/show_bug.cgi?id=138006
+
+ Reviewed by Philippe Normand.
+
+ Add ENABLE_INTROSPECTION option.
+
+ * Source/PlatformGTK.cmake: Dot not add gir global target if
+ introspection is disabled.
+ * Source/cmake/OptionsGTK.cmake: Do not add gir individual targets if
+ introspection is disabled.
+
2014-11-12 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.6.3 release.
Modified: releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog (176390 => 176391)
--- releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/ChangeLog 2014-11-20 10:41:04 UTC (rev 176391)
@@ -1,3 +1,14 @@
+2014-11-01 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(CMake): Make it possible to build without introspection
+ https://bugs.webkit.org/show_bug.cgi?id=138006
+
+ Reviewed by Philippe Normand.
+
+ Do not install introspection files when introspection is disabled.
+
+ * PlatformGTK.cmake:
+
2014-11-14 Benjamin Poulain <[email protected]>
STRH can store values with the wrong offset
Modified: releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/PlatformGTK.cmake (176390 => 176391)
--- releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/PlatformGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/_javascript_Core/PlatformGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
@@ -23,12 +23,15 @@
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/_javascript_Core"
)
-install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
- DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
-)
-install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.typelib
- DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
-)
+if (ENABLE_INTROSPECTION)
+ install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
+ DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.typelib
+ DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
+ )
+endif ()
+
add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
list(APPEND _javascript_Core_LIBRARIES
Modified: releases/WebKitGTK/webkit-2.6/Source/PlatformGTK.cmake (176390 => 176391)
--- releases/WebKitGTK/webkit-2.6/Source/PlatformGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/PlatformGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
@@ -1,7 +1,9 @@
add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
# This allows exposing a 'gir' target which builds all GObject introspection files.
-add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
+if (ENABLE_INTROSPECTION)
+ add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
+endif ()
list(APPEND DocumentationDependencies
GObjectDOMBindings
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (176390 => 176391)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-20 10:41:04 UTC (rev 176391)
@@ -1,3 +1,14 @@
+2014-11-01 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(CMake): Make it possible to build without introspection
+ https://bugs.webkit.org/show_bug.cgi?id=138006
+
+ Reviewed by Philippe Normand.
+
+ Do not install introspection files when introspection is disabled.
+
+ * PlatformGTK.cmake:
+
2014-11-19 Michael Catanzaro <[email protected]>
[GTK] Error in documentation of webkit_print_operation_get_page_setup()
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake (176390 => 176391)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
@@ -829,15 +829,18 @@
${WebKit2WebExtension_INSTALLED_HEADERS}
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit2"
)
-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
- ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
- DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
-)
-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
- ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
- DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
-)
+if (ENABLE_INTROSPECTION)
+ install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+ DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
+ DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
+ )
+endif ()
+
file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkit2gtk.cfg
"[webkit2gtk]\n"
"pkgconfig_file=${WebKit2_PKGCONFIG_FILE}\n"
Modified: releases/WebKitGTK/webkit-2.6/Source/cmake/OptionsGTK.cmake (176390 => 176391)
--- releases/WebKitGTK/webkit-2.6/Source/cmake/OptionsGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/cmake/OptionsGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
@@ -15,6 +15,7 @@
set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
+set(ENABLE_INTROSPECTION ON CACHE BOOL "Whether to enable GObject introspection.")
# These are shared variables, but we special case their definition so that we can use the
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
@@ -346,10 +347,12 @@
# Add a typelib file to the list of all typelib dependencies. This makes it easy to
# expose a 'gir' target with all gobject-introspection files.
macro(ADD_TYPELIB typelib)
- get_filename_component(target_name ${typelib} NAME_WE)
- add_custom_target(${target_name}-gir ALL DEPENDS ${typelib})
- list(APPEND GObjectIntrospectionTargets ${target_name}-gir)
- set(GObjectIntrospectionTargets ${GObjectIntrospectionTargets} PARENT_SCOPE)
+ if (ENABLE_INTROSPECTION)
+ get_filename_component(target_name ${typelib} NAME_WE)
+ add_custom_target(${target_name}-gir ALL DEPENDS ${typelib})
+ list(APPEND GObjectIntrospectionTargets ${target_name}-gir)
+ set(GObjectIntrospectionTargets ${GObjectIntrospectionTargets} PARENT_SCOPE)
+ endif ()
endmacro()
# CMake does not automatically add --whole-archive when building shared objects from
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
