Changeset 2747

Show
Ignore:
Timestamp:
01/31/18 02:21:58 (4 months ago)
Author:
jwoithe
Message:

[PATCH 11/13] improve r2725 (allow BUILD_MIXER with qt5).

From Nicolas Boulenguez.

This version is both more efficient (which pyuic* is executed only once) and
readable (there is a single alternative with two branches).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/SConstruct

    r2736 r2747  
    399399# PyQT checks 
    400400if env['BUILD_MIXER'] != 'false': 
    401     have_dbus = ((conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) or (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' ))) 
    402     have_pyqt4 = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'PyQt4' )) 
    403     have_pyqt5 = (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'PyQt5' )) 
    404     if ((have_pyqt4 or have_pyqt5) and have_dbus): 
     401    if  (    conf.CheckForApp( 'which pyuic4' ) \ 
     402         and conf.CheckForPyModule( 'PyQt4' ) \ 
     403         and conf.CheckForPyModule( 'dbus.mainloop.qt' )) \ 
     404     or (    conf.CheckForApp( 'which pyuic5' ) \ 
     405         and conf.CheckForPyModule( 'PyQt5' ) \ 
     406         and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' )): 
    405407        env['BUILD_MIXER'] = 'true' 
    406408    elif not env.GetOption('clean'):