Title: [165111] trunk/Tools
- Revision
- 165111
- Author
- [email protected]
- Date
- 2014-03-05 08:52:29 -0800 (Wed, 05 Mar 2014)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (165110 => 165111)
--- trunk/Tools/ChangeLog 2014-03-05 16:46:53 UTC (rev 165110)
+++ trunk/Tools/ChangeLog 2014-03-05 16:52:29 UTC (rev 165111)
@@ -1,5 +1,16 @@
2014-03-05 Martin Robinson <[email protected]>
+ [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.
+
+2014-03-05 Martin Robinson <[email protected]>
+
[GTK] The jhbuild environment should have the latest stable release of gtk-doc
https://bugs.webkit.org/show_bug.cgi?id=129651
Modified: trunk/Tools/Scripts/webkitdirs.pm (165110 => 165111)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-03-05 16:46:53 UTC (rev 165110)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-03-05 16:52:29 UTC (rev 165111)
@@ -1979,7 +1979,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
