summaryrefslogtreecommitdiff
path: root/Jamrules.jam
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 /Jamrules.jam
parentd79477859f80a2ffe685bd1b5cd36ebdd42fda61 (diff)
tests: Added C++/CLI support
git-svn-id: http://pugixml.googlecode.com/svn/trunk@805 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'Jamrules.jam')
-rw-r--r--Jamrules.jam17
1 files changed, 14 insertions, 3 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 ;
}