Changeset 208951 in webkit


Ignore:
Timestamp:
Nov 21, 2016 12:32:42 PM (7 years ago)
Author:
clopez@igalia.com
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):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r208940 r208951  
     12016-11-21  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [CMake] build fails after update to cmake 3.7
     4        https://bugs.webkit.org/show_bug.cgi?id=165008
     5
     6        Reviewed by Dan Bernstein.
     7
     8        When we remove the CMake cache, we should remove both the
     9        CMakeCache.txt file and the CMakeFiles directory.
     10        See: https://gitlab.kitware.com/cmake/cmake/issues/14820
     11
     12        * Scripts/webkitdirs.pm:
     13        (cmakeFilesPath):
     14        (removeCMakeCache):
     15
    1162016-11-16  Philippe Normand  <pnormand@igalia.com>
    217
  • trunk/Tools/Scripts/webkitdirs.pm

    r208644 r208951  
    18321832}
    18331833
     1834sub cmakeFilesPath()
     1835{
     1836    return File::Spec->catdir(baseProductDir(), configuration(), "CMakeFiles");
     1837}
     1838
    18341839sub shouldRemoveCMakeCache(@)
    18351840{
     
    18851890    if (shouldRemoveCMakeCache(@buildArgs)) {
    18861891        my $cmakeCache = cmakeCachePath();
     1892        my $cmakeFiles = cmakeFilesPath();
    18871893        unlink($cmakeCache) if -e $cmakeCache;
     1894        rmtree($cmakeFiles) if -d $cmakeFiles;
    18881895    }
    18891896}
Note: See TracChangeset for help on using the changeset viewer.