Skip to content

Commit

Permalink
Merge r174310 - [GTK] Do not generate webkit2gtk-tests-resources.gres…
Browse files Browse the repository at this point in the history
…ource unconditionally

https://bugs.webkit.org/show_bug.cgi?id=137391

Reviewed by Martin Robinson.

Add a custom command to only re-generate
webkit2gtk-tests-resources.gresource when any of its dependencies changes.

* TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:

Canonical link: https://commits.webkit.org/154760.76@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@174576 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
carlosgcampos committed Oct 10, 2014
1 parent f3a7713 commit fee6e5f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,15 @@
2014-10-04 Carlos Garcia Campos <cgarcia@igalia.com>

[GTK] Do not generate webkit2gtk-tests-resources.gresource unconditionally
https://bugs.webkit.org/show_bug.cgi?id=137391

Reviewed by Martin Robinson.

Add a custom command to only re-generate
webkit2gtk-tests-resources.gresource when any of its dependencies changes.

* TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt:

2014-09-29 Carlos Garcia Campos <cgarcia@igalia.com>

[GTK] Remove IntPointGtk.cpp and IntRectGtk.cpp
Expand Down
7 changes: 6 additions & 1 deletion Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt
Expand Up @@ -38,7 +38,8 @@ add_library(WebKit2APITestCore STATIC
)
target_link_libraries(WebKit2APITestCore WebKit2)

add_custom_target(test-gresource-bundle
add_custom_command(
OUTPUT ${TEST_RESOURCES_DIR}/webkit2gtk-tests-resources.gresource
DEPENDS resources/webkit2gtk-tests.gresource.xml
resources/link-title.js
COMMAND glib-compile-resources
Expand All @@ -47,6 +48,10 @@ add_custom_target(test-gresource-bundle
${CMAKE_CURRENT_LIST_DIR}/resources/webkit2gtk-tests.gresource.xml
)

add_custom_target(test-gresource-bundle
DEPENDS ${TEST_RESOURCES_DIR}/webkit2gtk-tests-resources.gresource
)

macro(ADD_WK2_TEST_WEB_EXTENSION extension_name)
add_library(${extension_name} MODULE ${ARGN})
add_dependencies(${extension_name} WebKit2)
Expand Down

0 comments on commit fee6e5f

Please sign in to comment.