Skip to content
Permalink
Browse files
[GTK][CMake] --update-gtk has no effect
https://bugs.webkit.org/show_bug.cgi?id=130088

Patch by Gustavo Noronha Silva <gustavo.noronha@collabora.com> on 2014-03-11
Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit): call update-webkitgtk-libs if --update-gtk has been passed
as an argument.

Canonical link: https://commits.webkit.org/148070@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@165457 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Gustavo Noronha Silva authored and kov committed Mar 12, 2014
1 parent 0e50a81 commit 1ea0abc8bd05ccb1cafa1b7cc3b52d81b5199b32
Showing 2 changed files with 15 additions and 0 deletions.
@@ -1,3 +1,14 @@
2014-03-11 Gustavo Noronha Silva <gustavo.noronha@collabora.com>

[GTK][CMake] --update-gtk has no effect
https://bugs.webkit.org/show_bug.cgi?id=130088

Reviewed by Philippe Normand.

* Scripts/webkitdirs.pm:
(buildCMakeProjectOrExit): call update-webkitgtk-libs if --update-gtk has been passed
as an argument.

2014-03-10 Myles C. Maxfield <mmaxfield@apple.com>

Add "System Font" to the list of whitelisted DRT fonts
@@ -2076,6 +2076,10 @@ sub buildCMakeProjectOrExit($$$$@)
system("perl", "$sourceDir/Tools/Scripts/update-webkitefl-libs") == 0 or die $!;
}

if (isGtk() && checkForArgumentAndRemoveFromARGV("--update-gtk")) {
system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
}

$returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
exit($returnCode) if $returnCode;

0 comments on commit 1ea0abc

Please sign in to comment.