External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Added C++/CLI support

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@805 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2011-02-16 20:00:08 +00:00
parent d79477859f
commit 5f4ecb9ec3
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Jamrules.jam
View File

@ -139,13 +139,20 @@ else if ( $(toolset:I=^msvc) )
RESULT += /Z7 ; RESULT += /Z7 ;
} }
local RUNTIME = "MT" ;
if ( $(toolset:I=_clr) )
{
RUNTIME = "MD" ;
}
if ( $(CONFIG) = "debug" ) if ( $(CONFIG) = "debug" )
{ {
RESULT += /D_DEBUG /MTd ; RESULT += /D_DEBUG /$(RUNTIME)d ;
} }
else else
{ {
RESULT += /DNDEBUG /Ox /MT ; RESULT += /DNDEBUG /Ox /$(RUNTIME) ;
} }
if ( $(toolset) = msvc7 || $(toolset) = msvc71 || $(toolset) = msvc8 ) if ( $(toolset) = msvc7 || $(toolset) = msvc71 || $(toolset) = msvc8 )
@ -162,7 +169,11 @@ else if ( $(toolset:I=^msvc) )
RESULT += /W3 ; # lots of warnings at W4 in standard library RESULT += /W3 ; # lots of warnings at W4 in standard library
} }
if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) ) if ( $(toolset:I=_clr) )
{
RESULT += /clr ;
}
else if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) )
{ {
RESULT += /EHsc ; RESULT += /EHsc ;
} }

2
tests/autotest-local.pl
View File

@ -34,7 +34,7 @@ sub getcpucount
undef; undef;
} }
@alltoolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw45_0x, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64, xbox360, ps3_gcc, ps3_snc) : ($^O =~ /solaris/) ? (suncc, suncc_x64) : &gcctoolset(); @alltoolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw45_0x, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64, msvc10_clr, msvc10_clr_x64, xbox360, ps3_gcc, ps3_snc) : ($^O =~ /solaris/) ? (suncc, suncc_x64) : &gcctoolset();
$fast = scalar grep(/^fast$/, @ARGV); $fast = scalar grep(/^fast$/, @ARGV);
@toolsets = map { /^fast$/ ? () : ($_) } @ARGV; @toolsets = map { /^fast$/ ? () : ($_) } @ARGV;

2
tests/autotest-report.pl
View File

@ -7,6 +7,8 @@ sub prettysuffix
return " C++0x" if ($suffix eq '_0x'); return " C++0x" if ($suffix eq '_0x');
return " x64" if ($suffix eq '_x64'); return " x64" if ($suffix eq '_x64');
return " CLR" if ($suffix eq '_clr');
return " CLR x64" if ($suffix eq '_clr_x64');
return " PPC" if ($suffix eq '_ppc'); return " PPC" if ($suffix eq '_ppc');
return ""; return "";