diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-02 15:37:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 15:28:59 +0200 |
| commit | 5fae23eb26b172d4677db273049119b16db272d3 (patch) | |
| tree | 7cc9bc7b302998adf070f80a01fbe8715dc23a4b /configure | |
| parent | 051f97f3504bbb0c50450205f00d6c136b0eebb8 (diff) | |
introduce -fully-process configure option, change behavior of -process
configure will now run qmake without -recursive, as on modern systems
one can get a lot more out of parallelization done by make, which qmake
cannot do.
use -fully-process to get back the old behavior. -dont-process is
unchanged.
Change-Id: I2874321a963175463ae8992f3ab2b01bc13c9922
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -814,7 +814,7 @@ CFG_SILENT=no CFG_ALSA=auto CFG_PULSEAUDIO=auto CFG_COREWLAN=auto -CFG_NOPROCESS=no +CFG_PROCESS=yes CFG_ICU=auto CFG_FORCE_ASSERTS=no CFG_PCRE=auto @@ -1969,10 +1969,13 @@ while [ "$#" -gt 0 ]; do CFG_SILENT="$VAL" ;; dont-process) - CFG_NOPROCESS=yes + CFG_PROCESS=no ;; process) - CFG_NOPROCESS=no + CFG_PROCESS=partial + ;; + fully-process) + CFG_PROCESS=full ;; audio-backend) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then @@ -2985,6 +2988,10 @@ Configure options: * -shared ............ Create and use shared Qt libraries. -static ............ Create and use static Qt libraries. + * -process ........... Generate only a top-level Makefile. + -fully-process ..... Generate Makefiles for the entire Qt tree. + -dont-process ...... Do not generate any Makefiles. + * -no-fast ........... Configure Qt normally by generating Makefiles for all project files. -fast .............. Configure Qt quickly by generating Makefiles only for @@ -6185,10 +6192,15 @@ EXEC="" # build makefiles based on the configuration #------------------------------------------------------------------------------- -if [ "$CFG_NOPROCESS" != "yes" ]; then - echo "Creating makefiles. Please wait..." - "$outpath/bin/qmake" -r ${OPT_FAST+CONFIG+=fast} "$relpath" - echo "Done" +if [ "$CFG_PROCESS" != "no" ]; then + + if [ "$CFG_PROCESS" = "full" ]; then + echo "Creating makefiles. Please wait..." + "$outpath/bin/qmake" -r "$relpath" + echo "Done" + else + "$outpath/bin/qmake" "$relpath" + fi if [ "$OPT_FAST" = "yes" ]; then PART_ROOTS= |