Changeset View
Changeset View
Standalone View
Standalone View
modules/ksb/Application.pm
| Show First 20 Lines • Show All 2400 Lines • ▼ Show 20 Line(s) | |||||
| 2401 | # Parameters: | 2401 | # Parameters: | ||
| 2402 | # 1. Build context | 2402 | # 1. Build context | ||
| 2403 | # | 2403 | # | ||
| 2404 | # Return value: | 2404 | # Return value: | ||
| 2405 | # None | 2405 | # None | ||
| 2406 | sub _checkForEssentialBuildPrograms | 2406 | sub _checkForEssentialBuildPrograms | ||
| 2407 | { | 2407 | { | ||
| 2408 | my $ctx = assert_isa(shift, 'ksb::BuildContext'); | 2408 | my $ctx = assert_isa(shift, 'ksb::BuildContext'); | ||
| 2409 | my $kdedir = $ctx->getOption('kdedir'); | ||||
| 2410 | my $qtdir = $ctx->getOption('qtdir'); | ||||
| 2411 | my @preferred_paths = ("$kdedir/bin", "$qtdir/bin"); | ||||
| 2409 | 2412 | | |||
| 2410 | return 1 if pretending(); | 2413 | return 1 if pretending(); | ||
| 2411 | 2414 | | |||
| 2412 | my @buildModules = $ctx->modulesInPhase('build'); | 2415 | my @buildModules = $ctx->modulesInPhase('build'); | ||
| 2413 | my %requiredPrograms; | 2416 | my %requiredPrograms; | ||
| 2414 | my %modulesRequiringProgram; | 2417 | my %modulesRequiringProgram; | ||
| 2415 | 2418 | | |||
| 2416 | foreach my $module ($ctx->modulesInPhase('build')) { | 2419 | foreach my $module ($ctx->modulesInPhase('build')) { | ||
| Show All 10 Lines | |||||
| 2427 | 2430 | | |||
| 2428 | my $wasError = 0; | 2431 | my $wasError = 0; | ||
| 2429 | for my $prog (keys %requiredPrograms) { | 2432 | for my $prog (keys %requiredPrograms) { | ||
| 2430 | my %requiredPackages = ( | 2433 | my %requiredPackages = ( | ||
| 2431 | qmake => 'Qt', | 2434 | qmake => 'Qt', | ||
| 2432 | cmake => 'CMake', | 2435 | cmake => 'CMake', | ||
| 2433 | ); | 2436 | ); | ||
| 2434 | 2437 | | |||
| 2435 | my $programPath = absPathToExecutable($prog); | 2438 | my $preferredPath = absPathToExecutable2($prog, @preferred_paths); | ||
| 2439 | my $programPath = $preferredPath || absPathToExecutable($prog); | ||||
| 2436 | 2440 | | |||
| 2437 | # qmake is not necessarily named 'qmake' | 2441 | # qmake is not necessarily named 'qmake' | ||
| 2438 | if (!$programPath && $prog eq 'qmake') { | 2442 | if (!$programPath && $prog eq 'qmake') { | ||
| 2439 | $programPath = ksb::BuildSystem::QMake::absPathToQMake(); | 2443 | $programPath = ksb::BuildSystem::QMake::absPathToQMake(); | ||
| 2440 | } | 2444 | } | ||
| 2441 | 2445 | | |||
| 2442 | if (!$programPath) { | 2446 | if (!$programPath) { | ||
| 2443 | # Don't complain about Qt if we're building it... | 2447 | # Don't complain about Qt if we're building it... | ||
| 2444 | if ($prog eq 'qmake' && ( | 2448 | if ($prog eq 'qmake' && ( | ||
| 2445 | grep { $_->buildSystemType() eq 'Qt' } (@buildModules)) || | 2449 | grep { $_->buildSystemType() eq 'Qt' || | ||
| 2450 | $_->buildSystemType() eq 'Qt5' } (@buildModules)) || | ||||
| 2446 | pretending() | 2451 | pretending() | ||
| 2447 | ) | 2452 | ) | ||
| 2448 | { | 2453 | { | ||
| 2449 | next; | 2454 | next; | ||
| 2450 | } | 2455 | } | ||
| 2451 | 2456 | | |||
| 2452 | $wasError = 1; | 2457 | $wasError = 1; | ||
| 2453 | my $reqPackage = $requiredPackages{$prog} || $prog; | 2458 | my $reqPackage = $requiredPackages{$prog} || $prog; | ||
| ▲ Show 20 Lines • Show All 170 Lines • Show Last 20 Lines | |||||