Update of /cvsroot/cppunit/cppunit2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20584
Modified Files:
sconstruct
Log Message:
added rough support to build qt 4.0 application.
Index: sconstruct
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** sconstruct 6 Mar 2005 21:44:18 -0000 1.12
--- sconstruct 24 Jun 2005 19:51:28 -0000 1.13
***************
*** 53,67 ****
for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
env.Tool( tool )
! env['CXXFLAGS']='-GR -GX'
elif platform == 'msvc70':
env['MSVS_VERSION']='7.0'
for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
env.Tool( tool )
! env['CXXFLAGS']='-GR -GX'
elif platform == 'msvc71':
env['MSVS_VERSION']='7.1'
for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
env.Tool( tool )
! env['CXXFLAGS']='-GR -GX'
elif platform == 'mingw':
env.Tool( 'mingw' )
--- 53,67 ----
for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
env.Tool( tool )
! env['CXXFLAGS']='-GR -GX /nologo'
elif platform == 'msvc70':
env['MSVS_VERSION']='7.0'
for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
env.Tool( tool )
! env['CXXFLAGS']='-GR -GX /nologo'
elif platform == 'msvc71':
env['MSVS_VERSION']='7.1'
for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
env.Tool( tool )
! env['CXXFLAGS']='-GR -GX /nologo'
elif platform == 'mingw':
env.Tool( 'mingw' )
***************
*** 95,99 ****
buildCppUnitExample( env, target_sources, target_name )
! Export( 'env env_testing buildCppUnitExample buildLibary buildLibraryUnitTest' )
def buildProjectInDirectory( target_directory ):
--- 95,116 ----
buildCppUnitExample( env, target_sources, target_name )
! def buildQTApplication( env, ui_sources, target_sources, target_name ):
! env = env.Copy()
! env.Replace( QT_MOCCXXSUFFIX = 'cpp' ) # doesn't work
! qt_tool = Tool('qt')
! qt_tool( env )
! extra_include_dir = []
! for ui_source in ui_sources:
! ui_target = "ui_" + os.path.splitext( ui_source)[0] + ".h"
! env.Uic( target = ui_target, source = ui_source )
! if not extra_include_dir:
! extra_include_dir = [ os.path.split( env.File( ui_target ).abspath ) [0] ]
! env.Append( CPPPATH = extra_include_dir )
! exe = env.Program( target=target_name,
! source=target_sources )
! global bin_dir
! env.Install( bin_dir, exe )
!
! Export( 'env env_testing buildCppUnitExample buildLibary buildLibraryUnitTest buildQTApplication' )
def buildProjectInDirectory( target_directory ):
***************
*** 110,111 ****
--- 127,129 ----
buildProjectInDirectory( 'examples/parametrized_test' )
buildProjectInDirectory( 'examples/checking_assertions' )
+ #buildProjectInDirectory( 'src/qttestdriver' )
|
