Skip to content

Commit dff977c

Browse files
CelluleCellule
committed
Disable warning for catch.hpp that happens on dev15
Use MSBuildToolsVersion to check for which toolset to use when using msbuild15 directly
1 parent 489d6c3 commit dff977c

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎Build/Common.Build.Default.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
<!-- Auto tool set selection -->
1111
<PropertyGroup>
12-
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11.0'">v110</PlatformToolset>
13-
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
14-
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
15-
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
12+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11.0' or '$(MSBuildToolsVersion)'=='11.0'">v110</PlatformToolset>
13+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0' or '$(MSBuildToolsVersion)'=='12.0'">v120</PlatformToolset>
14+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0' or '$(MSBuildToolsVersion)'=='14.0'">v140</PlatformToolset>
15+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0' or '$(MSBuildToolsVersion)'=='15.0'">v141</PlatformToolset>
1616
</PropertyGroup>
1717

1818
<!-- Default ChakraDevConfigDir -->
@@ -57,7 +57,7 @@
5757
<PropertyGroup>
5858
<OutBaseDir Condition="'$(OutBaseDir)'!=''">$(OutBaseDir)\$(SolutionName)</OutBaseDir>
5959
<OutBaseDir Condition="'$(OutBaseDir)'==''">$(SolutionDir)VcBuild</OutBaseDir>
60-
<OutBaseDir Condition="'$(Clang)'!=''">$(OutBaseDir).$(Clang)</OutBaseDir>
60+
<OutBaseDir Condition="'$(Clang)'!=''">$(OutBaseDir).$(Clang)</OutBaseDir>
6161
<OutBaseDir Condition="'$(BuildJIT)'=='false'">$(OutBaseDir).NoJIT</OutBaseDir>
6262
<OutBaseDir Condition="'$(ForceSWB)'=='true'">$(OutBaseDir).SWB</OutBaseDir>
6363
<IntBaseDir Condition="'$(IntBaseDir)'==''">$(OutBaseDir)</IntBaseDir>

‎bin/NativeTests/NativeTests.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
#include "stdafx.h"
66

77
#define CATCH_CONFIG_RUNNER
8+
#pragma warning(push)
9+
#pragma warning(disable:4244)
810
#include "catch.hpp"
11+
#pragma warning(pop)
912

1013
// Use nativetests.exe -? to get all command line options
1114

0 commit comments

Comments
 (0)