Changeset 195057 in webkit
- Timestamp:
- Jan 14, 2016 8:31:58 AM (8 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r194997 r195057 1 2016-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 1 16 2016-01-13 Myles C. Maxfield <mmaxfield@apple.com> 2 17 -
trunk/Tools/Scripts/webkitdirs.pm
r194849 r195057 1910 1910 } 1911 1911 1912 sub canUseEclipse(@) 1913 { 1914 return commandExists("eclipse"); 1912 sub 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 1919 sub 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; 1915 1924 } 1916 1925 … … 1937 1946 1938 1947 # 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(); 1940 1949 if (-e cmakeCachePath() && -e cmakeGeneratedBuildfile($willUseNinja)) { 1941 1950 return 0; … … 1954 1963 if ($willUseNinja) { 1955 1964 push @args, "-G"; 1956 if (canUseEclipse ()) {1965 if (canUseEclipseNinjaGenerator()) { 1957 1966 push @args, "'Eclipse CDT4 - Ninja'"; 1958 1967 } else {
Note: See TracChangeset
for help on using the changeset viewer.