From 0e2ec55addc61c8e6b576162e680b78bcc33559f Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Sun, 9 Dec 2007 19:59:39 +0000 Subject: [PATCH] Fix scons (moc src/support/*.h) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22048 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 4eef2111ff..51bf864ead 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -1499,6 +1499,11 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG # # src/support # +frontend_env['QT4_MOCHPREFIX'] = '' +frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp' + +support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x) + for x in src_support_header_files ] support = frontend_env.StaticLibrary( target = '$LOCALLIBPATH/support', source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \ @@ -1511,7 +1516,7 @@ support = frontend_env.StaticLibrary( '-DQT_NO_STL', '-DQT_NO_KEYWORDS', ], - CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip'] + CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support', '$TOP_SRCDIR/src/support/minizip'] ) Alias('support', support) @@ -1559,9 +1564,6 @@ Alias('graphics', graphics) # # src/frontend/qt4 # -frontend_env['QT4_MOCHPREFIX'] = '' -frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp' - # tells scons how to get these moced files, although not all moced files are needed # (or are actually generated). qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x)