Title: [168706] releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm
- Revision
- 168706
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:28:06 -0700 (Tue, 13 May 2014)
Log Message
Merge 165111 - [GTK][CMake] build-webkit should rerun cmake if the Makefile is missing
https://bugs.webkit.org/show_bug.cgi?id=129380
Reviewed by Philippe Normand.
* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject): Check for the existence of the Makefile before
skipping CMake execution.
Conflicts:
Tools/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm (168705 => 168706)
--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-13 19:27:55 UTC (rev 168705)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/webkitdirs.pm 2014-05-13 19:28:06 UTC (rev 168706)
@@ -1951,7 +1951,7 @@
chdir($buildPath) or die;
# For GTK+ we try to be smart about when to rerun cmake, so that we can have faster incremental builds.
- if (isGtk() && -e cmakeCachePath()) {
+ if (isGtk() && -e cmakeCachePath() && -e File::Spec->catfile(baseProductDir(), configuration(), "Makefile")) {
return 0;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
