* oln_master.cfg (f_oln_unix_gcc_4_1, f_oln_unix_gcc_4_2): Here. --- buildbot/masters/ChangeLog | 6 ++++++ buildbot/masters/oln_master.cfg | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 042dda9..f7990fb 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,9 @@ +2011-01-13 Roland Levillain <roland(a)lrde.epita.fr> + + Help seattle find Qt4 tools (qmake, moc, uic). + + * oln_master.cfg (f_oln_unix_gcc_4_1, f_oln_unix_gcc_4_2): Here. + 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> Tell seattle to use Python 2.5 in Olena builds. diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 88238ca..1b2ddfd 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -115,6 +115,8 @@ f_oln_unix_gcc_4_1 = GNUBuildSystem(project_repos='olena', scm_step=checkout, branch=mybranch, extra_configure_args='CXX="ccache g++-4.1" CC="ccache gcc-4.1" \ + QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ + UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all', @@ -124,6 +126,8 @@ f_oln_unix_gcc_4_1 = GNUBuildSystem(project_repos='olena', extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib', check_cmd='make -k check', distcheck_configure_args='CCX=\'ccache g++-4.1\' CC=\'ccache gcc-4.1\' \ + QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ + UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all' @@ -159,6 +163,8 @@ f_oln_unix_gcc_4_2 = GNUBuildSystem(project_repos='olena', branch=mybranch, extra_configure_args='CXX="ccache g++-4.2" \ CC="ccache gcc-4.2" \ + QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ + UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all', @@ -169,6 +175,8 @@ f_oln_unix_gcc_4_2 = GNUBuildSystem(project_repos='olena', check_cmd='make -k check', distcheck_configure_args='CXX=\'ccache g++-4.2\' \ CC=\'ccache gcc-4.2\' \ + QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ + UIC=/usr/bin/uic-qt4 \ --enable-all \ --without-magickxx \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm' -- 1.5.6.5