Title: [174693] trunk/Tools
- Revision
- 174693
- Author
- [email protected]
- Date
- 2014-10-14 12:12:42 -0700 (Tue, 14 Oct 2014)
Log Message
[cmake] Fix the make build after r174683
https://bugs.webkit.org/show_bug.cgi?id=137703
Reviewed by Martin Robinson.
* Scripts/webkitdirs.pm:
(buildCMakeGeneratedProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (174692 => 174693)
--- trunk/Tools/ChangeLog 2014-10-14 18:36:04 UTC (rev 174692)
+++ trunk/Tools/ChangeLog 2014-10-14 19:12:42 UTC (rev 174693)
@@ -1,3 +1,13 @@
+2014-10-14 Csaba Osztrogonác <[email protected]>
+
+ [cmake] Fix the make build after r174683
+ https://bugs.webkit.org/show_bug.cgi?id=137703
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitdirs.pm:
+ (buildCMakeGeneratedProject):
+
2014-10-14 Myles C. Maxfield <[email protected]>
Adding myself to the watchlist to CachedFont
Modified: trunk/Tools/Scripts/webkitdirs.pm (174692 => 174693)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-10-14 18:36:04 UTC (rev 174692)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-10-14 19:12:42 UTC (rev 174693)
@@ -1829,7 +1829,7 @@
$command = "$buildPath/build.sh";
@args = ($makeArgs);
}
- push @args, "-v" if $ENV{VERBOSE};
+ push @args, "-v" if ($ENV{VERBOSE} && canUseNinja());
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
# parsed for shell metacharacters. In particular, $makeArgs may contain such metacharacters.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
