Changeset 163032 in webkit

Timestamp:

Jan 29, 2014 11:51:24 AM (10 years ago)

Author:

Martin Robinson

Message:

[GTK] [CMake] Fix the build after r162835
​https://bugs.webkit.org/show_bug.cgi?id=127753

Reviewed by Gustavo Noronha Silva.

• CMakeLists.txt: Add support for using the prefix header (GCC / clang only for now)

when WebKit2_USE_PREFIX_HEADER is set to true.

• PlatformGTK.cmake: Set WebKit2_USE_PREFIX_HEADER support and no longer process some message.in files.
• WebKit2Prefix.h: Add support for the CMake GTK+ build.

Location:

trunk/Source/WebKit2

Files:

• CMakeLists.txt (modified) (4 diffs)
• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (5 diffs)
• WebKit2Prefix.h (modified) (1 diff)

trunk/Source/WebKit2/CMakeLists.txt

@@ -691 +691 @@
 endif ()
 
+macro(ADD_WEBKIT2_PREFIX_HEADER _target)
+    if (WebKit2_USE_PREFIX_HEADER)
+        get_target_property(OLD_COMPILE_FLAGS ${_target} COMPILE_FLAGS)
+        if (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND")
+            set(OLD_COMPILE_FLAGS "")
+        endif ()
+        set_target_properties(${_target} PROPERTIES COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -include ${WEBKIT2_DIR}/WebKit2Prefix.h")
+    endif ()
+endmacro()
+
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
@@ -701 +711 @@
 add_dependencies(WebKit2 WebCore)
 add_dependencies(WebKit2 ${WEBKIT2_EXTRA_DEPENDENCIES})
+add_webkit2_prefix_header(WebKit2)
 target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
 set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
@@ -710 +721 @@
 
 add_executable(WebProcess ${WebProcess_SOURCES})
+add_webkit2_prefix_header(WebProcess)
 target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
 set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
@@ -719 +731 @@
 if (ENABLE_NETWORK_PROCESS)
     add_executable(NetworkProcess ${NetworkProcess_SOURCES})
+    add_webkit2_prefix_header(NetworkProcess)
     target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
     set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [CMake] Fix the build after r162835
+        https://bugs.webkit.org/show_bug.cgi?id=127753
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * CMakeLists.txt: Add support for using the prefix header (GCC / clang only for now)
+        when WebKit2_USE_PREFIX_HEADER is set to true.
+        * PlatformGTK.cmake: Set WebKit2_USE_PREFIX_HEADER support and no longer process some message.in files.
+        * WebKit2Prefix.h: Add support for the CMake GTK+ build.
+
 2014-01-29  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -11 +11 @@
 add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 add_definitions(-DLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
+
+set(WebKit2_USE_PREFIX_HEADER ON)
 
 list(APPEND WebKit2_SOURCES
@@ -375 +377 @@
 )
 
-list(APPEND WebKit2_MESSAGES_IN_FILES
-    UIProcess/soup/WebSoupRequestManagerProxy.messages.in
-
-    WebProcess/soup/WebSoupRequestManager.messages.in
-)
-
 # This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
 list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
@@ -397 +393 @@
     "${WEBCORE_DIR}/platform/text/enchant"
     "${WEBKIT2_DIR}/Shared/API/c/gtk"
+    "${WEBKIT2_DIR}/Shared/Network/CustomProtocols/soup"
     "${WEBKIT2_DIR}/Shared/Downloads/soup"
     "${WEBKIT2_DIR}/Shared/gtk"
@@ -622 +619 @@
 
     add_executable(WebKitPluginProcess ${PluginProcess_SOURCES})
+    add_webkit2_prefix_header(WebKitPluginProcess)
 
     # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but
@@ -666 +664 @@
 )
 
-add_library(webkit2gtkinjectedbundle MODULE
-    "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp"
-)
+add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp")
 add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
+add_webkit2_prefix_header(webkit2gtkinjectedbundle)
 
 add_custom_command(

trunk/Source/WebKit2/WebKit2Prefix.h

@@ -25 +25 @@
  */
 
-#if defined (BUILDING_GTK__)
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else
 #include "autotoolsconfig.h"
-#endif /* defined (BUILDING_GTK__) */
+#endif
+#endif
 
 #include <wtf/Platform.h>