CopyHandler

Clone
ixen <ixen@copyhandler.com>
committed
bfc7a83
on 24 Dec 15
Project and source files' updates to allow them to build under VS2014.
LoggerImprovements + 5 more
ext/gmock/gmock.vc140.vcxproj (+8 -8)
26 26       <Platform>x64</Platform>
27 27     </ProjectConfiguration>
28 28     <ProjectConfiguration Include="Testing Release|Win32">
29 29       <Configuration>Testing Release</Configuration>
30 30       <Platform>Win32</Platform>
31 31     </ProjectConfiguration>
32 32     <ProjectConfiguration Include="Testing Release|x64">
33 33       <Configuration>Testing Release</Configuration>
34 34       <Platform>x64</Platform>
35 35     </ProjectConfiguration>
36 36   </ItemGroup>
37 37   <PropertyGroup Label="Globals">
38 38     <ProjectGuid>{D98F2D98-2352-4303-93EE-A5430C4E98AB}</ProjectGuid>
39 39     <RootNamespace>gmock</RootNamespace>
40 40     <Keyword>Win32Proj</Keyword>
41 41     <ProjectName>gmock</ProjectName>
42 42   </PropertyGroup>
43 43   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
44 44   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
45 45     <ConfigurationType>StaticLibrary</ConfigurationType>
46       <PlatformToolset>v140_xp</PlatformToolset>
  46     <PlatformToolset>v120_xp</PlatformToolset>
47 47     <CharacterSet>Unicode</CharacterSet>
48 48     <WholeProgramOptimization>true</WholeProgramOptimization>
49 49   </PropertyGroup>
50 50   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'" Label="Configuration">
51 51     <ConfigurationType>StaticLibrary</ConfigurationType>
52       <PlatformToolset>v140_xp</PlatformToolset>
  52     <PlatformToolset>v120_xp</PlatformToolset>
53 53     <CharacterSet>Unicode</CharacterSet>
54 54     <WholeProgramOptimization>true</WholeProgramOptimization>
55 55   </PropertyGroup>
56 56   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
57 57     <ConfigurationType>StaticLibrary</ConfigurationType>
58       <PlatformToolset>v140_xp</PlatformToolset>
  58     <PlatformToolset>v120_xp</PlatformToolset>
59 59     <CharacterSet>Unicode</CharacterSet>
60 60   </PropertyGroup>
61 61   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'" Label="Configuration">
62 62     <ConfigurationType>StaticLibrary</ConfigurationType>
63       <PlatformToolset>v140_xp</PlatformToolset>
  63     <PlatformToolset>v120_xp</PlatformToolset>
64 64     <CharacterSet>Unicode</CharacterSet>
65 65   </PropertyGroup>
66 66   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
67 67     <ConfigurationType>StaticLibrary</ConfigurationType>
68       <PlatformToolset>v140_xp</PlatformToolset>
  68     <PlatformToolset>v120_xp</PlatformToolset>
69 69     <CharacterSet>Unicode</CharacterSet>
70 70     <WholeProgramOptimization>true</WholeProgramOptimization>
71 71   </PropertyGroup>
72 72   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'" Label="Configuration">
73 73     <ConfigurationType>StaticLibrary</ConfigurationType>
74       <PlatformToolset>v140_xp</PlatformToolset>
  74     <PlatformToolset>v120_xp</PlatformToolset>
75 75     <CharacterSet>Unicode</CharacterSet>
76 76     <WholeProgramOptimization>true</WholeProgramOptimization>
77 77   </PropertyGroup>
78 78   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
79 79     <ConfigurationType>StaticLibrary</ConfigurationType>
80       <PlatformToolset>v140_xp</PlatformToolset>
  80     <PlatformToolset>v120_xp</PlatformToolset>
81 81     <CharacterSet>Unicode</CharacterSet>
82 82   </PropertyGroup>
83 83   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'" Label="Configuration">
84 84     <ConfigurationType>StaticLibrary</ConfigurationType>
85       <PlatformToolset>v140_xp</PlatformToolset>
  85     <PlatformToolset>v120_xp</PlatformToolset>
86 86     <CharacterSet>Unicode</CharacterSet>
87 87   </PropertyGroup>
88 88   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
89 89   <ImportGroup Label="ExtensionSettings">
90 90   </ImportGroup>
91 91   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
92 92     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
93 93     <Import Project="..\..\src\common\Boost.props" />
94 94   </ImportGroup>
95 95   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'" Label="PropertySheets">
96 96     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
97 97     <Import Project="..\..\src\common\Boost.props" />
98 98   </ImportGroup>
99 99   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
100 100     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
101 101     <Import Project="..\..\src\common\Boost.props" />
102 102   </ImportGroup>
103 103   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'" Label="PropertySheets">
104 104     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
105 105     <Import Project="..\..\src\common\Boost.props" />