diff options
Diffstat (limited to 'scripts/qt/qtmod_test.pl')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index d0fe0cc9..b555180d 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -640,10 +640,18 @@ sub run_compile # information. Issuing a `make module-FOO' should automatically build the module # and all deps, as parallel as possible. my $make_target = "module-$qt_gitmodule"; + if ($self->{ shadow_build_with_install_enabled }) { - # shadow build and installing? need to build & install together - $make_target .= '-install_subtargets'; + # shadow build and installing? + # Then we first install, then do another make to catch anything not + # covered by install (e.g. subdirs with no_default_install). + # Note that we have to do it in this unintuitive order because we need to ensure + # that e.g. qtbase is installed before we attempt to compile the modules which + # depend on qtbase. + my $make_install_target = "$make_target-install_subtargets"; + push @commands, sub { $self->exe( $make_bin, @make_args, $make_install_target ) }; } + push @commands, sub { $self->exe( $make_bin, @make_args, $make_target ) }; } else { |