Changeset 195057 in webkit


Ignore:
Timestamp:
Jan 14, 2016 8:31:58 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[CMake][GTK] CMake Error: Could not create named generator Eclipse CDT4 - Ninja
https://bugs.webkit.org/show_bug.cgi?id=132599

Patch by Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au> on 2016-01-14
Reviewed by Michael Catanzaro.

Check if cmake Ninja generators are installed.

  • Scripts/webkitdirs.pm:

(canUseNinjaGenerator):
(canUseEclipseNinjaGenerator):
(generateBuildSystemFromCMakeProject):
(canUseEclipse): Deleted.

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r194997 r195057  
     12016-01-14  Nikos Andronikos  <nikos.andronikos-webkit@cisra.canon.com.au>
     2
     3        [CMake][GTK] CMake Error: Could not create named generator Eclipse CDT4 - Ninja
     4        https://bugs.webkit.org/show_bug.cgi?id=132599
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Check if cmake Ninja generators are installed.
     9
     10        * Scripts/webkitdirs.pm:
     11        (canUseNinjaGenerator):
     12        (canUseEclipseNinjaGenerator):
     13        (generateBuildSystemFromCMakeProject):
     14        (canUseEclipse): Deleted.
     15
    1162016-01-13  Myles C. Maxfield  <mmaxfield@apple.com>
    217
  • trunk/Tools/Scripts/webkitdirs.pm

    r194849 r195057  
    19101910}
    19111911
    1912 sub canUseEclipse(@)
    1913 {
    1914     return commandExists("eclipse");
     1912sub canUseNinjaGenerator(@)
     1913{
     1914    # Check that a Ninja generator is installed
     1915    my $devnull = File::Spec->devnull();
     1916    return exitStatus(system("cmake -N -G Ninja >$devnull 2>&1")) == 0;
     1917}
     1918
     1919sub canUseEclipseNinjaGenerator(@)
     1920{
     1921    # Check that eclipse and eclipse Ninja generator is installed
     1922    my $devnull = File::Spec->devnull();
     1923    return commandExists("eclipse") && exitStatus(system("cmake -N -G 'Eclipse CDT4 - Ninja' >$devnull 2>&1")) == 0;
    19151924}
    19161925
     
    19371946
    19381947    # We try to be smart about when to rerun cmake, so that we can have faster incremental builds.
    1939     my $willUseNinja = canUseNinja();
     1948    my $willUseNinja = canUseNinja() && canUseNinjaGenerator();
    19401949    if (-e cmakeCachePath() && -e cmakeGeneratedBuildfile($willUseNinja)) {
    19411950        return 0;
     
    19541963    if ($willUseNinja) {
    19551964        push @args, "-G";
    1956         if (canUseEclipse()) {
     1965        if (canUseEclipseNinjaGenerator()) {
    19571966            push @args, "'Eclipse CDT4 - Ninja'";
    19581967        } else {
Note: See TracChangeset for help on using the changeset viewer.