Title: [208951] trunk/Tools
- Revision
- 208951
- Author
- clo...@igalia.com
- Date
- 2016-11-21 12:32:42 -0800 (Mon, 21 Nov 2016)
Log Message
[CMake] build fails after update to cmake 3.7
https://bugs.webkit.org/show_bug.cgi?id=165008
Reviewed by Dan Bernstein.
When we remove the CMake cache, we should remove both the
CMakeCache.txt file and the CMakeFiles directory.
See: https://gitlab.kitware.com/cmake/cmake/issues/14820
* Scripts/webkitdirs.pm:
(cmakeFilesPath):
(removeCMakeCache):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (208950 => 208951)
--- trunk/Tools/ChangeLog 2016-11-21 17:19:30 UTC (rev 208950)
+++ trunk/Tools/ChangeLog 2016-11-21 20:32:42 UTC (rev 208951)
@@ -1,3 +1,18 @@
+2016-11-21 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [CMake] build fails after update to cmake 3.7
+ https://bugs.webkit.org/show_bug.cgi?id=165008
+
+ Reviewed by Dan Bernstein.
+
+ When we remove the CMake cache, we should remove both the
+ CMakeCache.txt file and the CMakeFiles directory.
+ See: https://gitlab.kitware.com/cmake/cmake/issues/14820
+
+ * Scripts/webkitdirs.pm:
+ (cmakeFilesPath):
+ (removeCMakeCache):
+
2016-11-16 Philippe Normand <pnorm...@igalia.com>
[GTK][WebRTC] Switch to downstream OpenWebRTC and more recent GStreamer
Modified: trunk/Tools/Scripts/webkitdirs.pm (208950 => 208951)
--- trunk/Tools/Scripts/webkitdirs.pm 2016-11-21 17:19:30 UTC (rev 208950)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-11-21 20:32:42 UTC (rev 208951)
@@ -1831,6 +1831,11 @@
return File::Spec->catdir(baseProductDir(), configuration(), "CMakeCache.txt");
}
+sub cmakeFilesPath()
+{
+ return File::Spec->catdir(baseProductDir(), configuration(), "CMakeFiles");
+}
+
sub shouldRemoveCMakeCache(@)
{
my ($cacheFilePath, @buildArgs) = @_;
@@ -1884,7 +1889,9 @@
my (@buildArgs) = @_;
if (shouldRemoveCMakeCache(@buildArgs)) {
my $cmakeCache = cmakeCachePath();
+ my $cmakeFiles = cmakeFilesPath();
unlink($cmakeCache) if -e $cmakeCache;
+ rmtree($cmakeFiles) if -d $cmakeFiles;
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
