summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-02-16 20:00:08 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-02-16 20:00:08 +0000
commit5f4ecb9ec3f96ead5f41c1302aafc53d9e38e66f (patch)
tree603b57675bdf675d57e1027e236004365d42f73b
parentd79477859f80a2ffe685bd1b5cd36ebdd42fda61 (diff)
tests: Added C++/CLI support
git-svn-id: http://pugixml.googlecode.com/svn/trunk@805 99668b35-9821-0410-8761-19e4c4f06640
-rw-r--r--Jamrules.jam17
-rw-r--r--tests/autotest-local.pl2
-rw-r--r--tests/autotest-report.pl2
3 files changed, 17 insertions, 4 deletions
diff --git a/Jamrules.jam b/Jamrules.jam
index 389a6ad..3ee6d39 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -139,13 +139,20 @@ else if ( $(toolset:I=^msvc) )
RESULT += /Z7 ;
}
+ local RUNTIME = "MT" ;
+
+ if ( $(toolset:I=_clr) )
+ {
+ RUNTIME = "MD" ;
+ }
+
if ( $(CONFIG) = "debug" )
{
- RESULT += /D_DEBUG /MTd ;
+ RESULT += /D_DEBUG /$(RUNTIME)d ;
}
else
{
- RESULT += /DNDEBUG /Ox /MT ;
+ RESULT += /DNDEBUG /Ox /$(RUNTIME) ;
}
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
}
- if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) )
+ if ( $(toolset:I=_clr) )
+ {
+ RESULT += /clr ;
+ }
+ else if ( ! ( PUGIXML_NO_EXCEPTIONS in $(DEFINES) ) )
{
RESULT += /EHsc ;
}
diff --git a/tests/autotest-local.pl b/tests/autotest-local.pl
index 885e444..4b1a630 100644
--- a/tests/autotest-local.pl
+++ b/tests/autotest-local.pl
@@ -34,7 +34,7 @@ sub getcpucount
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);
@toolsets = map { /^fast$/ ? () : ($_) } @ARGV;
diff --git a/tests/autotest-report.pl b/tests/autotest-report.pl
index c450e49..f0f1e56 100644
--- a/tests/autotest-report.pl
+++ b/tests/autotest-report.pl
@@ -7,6 +7,8 @@ sub prettysuffix
return " C++0x" if ($suffix eq '_0x');
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 "";