Skip to content

Commit 70df99f

Browse files
pleroypleroy
committed
A props file and simpler projects files.
1 parent bff6dda commit 70df99f

File tree

5 files changed

+223
-259
lines changed

5 files changed

+223
-259
lines changed

‎msvc/benchmark.props‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<Keyword>Win32Proj</Keyword>
5+
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
6+
</PropertyGroup>
7+
<!--Define project configurations. Nothing interesting can happen here.-->
8+
<ItemGroup Label="ProjectConfigurations">
9+
<ProjectConfiguration Include="Debug|x64">
10+
<Configuration>Debug</Configuration>
11+
<Platform>x64</Platform>
12+
</ProjectConfiguration>
13+
<ProjectConfiguration Include="Release|x64">
14+
<Configuration>Release</Configuration>
15+
<Platform>x64</Platform>
16+
</ProjectConfiguration>
17+
</ItemGroup>
18+
19+
<!--Microsoft C++ stuff.-->
20+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
21+
22+
<!--Definitions.-->
23+
<PropertyGroup>
24+
<!--Predicates.-->
25+
<PrincipiaCompilerClangLLVM>false</PrincipiaCompilerClangLLVM>
26+
<PrincipiaCompilerClangLLVM Condition="$(Configuration)==Release_LLVM">true</PrincipiaCompilerClangLLVM>
27+
<PrincipiaOptimize>false</PrincipiaOptimize>
28+
<PrincipiaOptimize Condition="$(Configuration.StartsWith('Release'))">true</PrincipiaOptimize>
29+
<PrincipiaMainProject>false</PrincipiaMainProject>
30+
<PrincipiaMainProject Condition="$(ProjectName) == benchmarks or
31+
$(ProjectName) == tests">true</PrincipiaMainProject>
32+
<!--Dependency paths.-->
33+
<PrincipiaDependencyConfiguration>Debug</PrincipiaDependencyConfiguration>
34+
<PrincipiaDependencyConfiguration Condition="$(PrincipiaOptimize)">Release</PrincipiaDependencyConfiguration>
35+
</PropertyGroup>
36+
37+
<!--Compiler.-->
38+
<PropertyGroup>
39+
<PlatformToolset>v142</PlatformToolset>
40+
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
41+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
42+
</PropertyGroup>
43+
44+
<!--Target.-->
45+
<PropertyGroup>
46+
<ConfigurationType>StaticLibrary</ConfigurationType>
47+
<ConfigurationType Condition="$(ProjectName)=='google-benchmark-test'">Application</ConfigurationType>
48+
</PropertyGroup>
49+
<ItemDefinitionGroup Condition="$(ConfigurationType)==Application">
50+
<Link>
51+
<SubSystem>Console</SubSystem>
52+
</Link>
53+
</ItemDefinitionGroup>
54+
55+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
56+
57+
<!--Common options.-->
58+
<PropertyGroup>
59+
<CharacterSet>Unicode</CharacterSet>
60+
</PropertyGroup>
61+
<ItemDefinitionGroup>
62+
<ClCompile>
63+
<CallingConvention>vectorcall</CallingConvention>
64+
<LanguageStandard>stdcpp17</LanguageStandard>
65+
<WarningLevel>Level3</WarningLevel>
66+
<AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
67+
<PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;GOOGLEBENCHMARK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
68+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
69+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
70+
</ClCompile>
71+
<Link>
72+
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
73+
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
74+
</Link>
75+
<Lib>
76+
<LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
77+
</Lib>
78+
</ItemDefinitionGroup>
79+
80+
<!--Debug options.-->
81+
<PropertyGroup Condition="!$(PrincipiaOptimize)">
82+
<UseDebugLibraries>true</UseDebugLibraries>
83+
</PropertyGroup>
84+
<ItemDefinitionGroup Condition="!$(PrincipiaOptimize)">
85+
<ClCompile>
86+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
87+
<Optimization>Disabled</Optimization>
88+
</ClCompile>
89+
</ItemDefinitionGroup>
90+
91+
<!--Release options.-->
92+
<PropertyGroup Condition="$(PrincipiaOptimize)">
93+
<UseDebugLibraries>false</UseDebugLibraries>
94+
</PropertyGroup>
95+
<ItemDefinitionGroup Condition="$(PrincipiaOptimize)">
96+
<ClCompile>
97+
<Optimization>MaxSpeed</Optimization>
98+
<FunctionLevelLinking>true</FunctionLevelLinking>
99+
<IntrinsicFunctions>true</IntrinsicFunctions>
100+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101+
</ClCompile>
102+
<Link>
103+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
104+
<OptimizeReferences>true</OptimizeReferences>
105+
</Link>
106+
</ItemDefinitionGroup>
107+
108+
<!--Import our property sheets.-->
109+
<ImportGroup Label="PropertySheets">
110+
<Import Project="windows_libraries.props" />
111+
<Import Project="portability_macros.props" />
112+
</ImportGroup>
113+
114+
<!--This import must be at the end.-->
115+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
116+
</Project>

‎msvc/google-benchmark-test.vcxproj‎

Lines changed: 8 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|x64">
5-
<Configuration>Debug</Configuration>
6-
<Platform>x64</Platform>
7-
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|x64">
9-
<Configuration>Release</Configuration>
10-
<Platform>x64</Platform>
11-
</ProjectConfiguration>
12-
</ItemGroup>
133
<PropertyGroup Label="Globals">
4+
<VCProjectVersion>16.0</VCProjectVersion>
145
<ProjectGuid>{ABB7BEF8-2C48-4967-A703-7B6FB9AB831F}</ProjectGuid>
15-
<Keyword>Win32Proj</Keyword>
16-
<RootNamespace>googlebenchmarktest</RootNamespace>
176
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
187
</PropertyGroup>
19-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
21-
<ConfigurationType>Application</ConfigurationType>
22-
<UseDebugLibraries>true</UseDebugLibraries>
23-
<PlatformToolset>v142</PlatformToolset>
24-
<CharacterSet>Unicode</CharacterSet>
25-
</PropertyGroup>
26-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
27-
<ConfigurationType>Application</ConfigurationType>
28-
<UseDebugLibraries>false</UseDebugLibraries>
29-
<PlatformToolset>v142</PlatformToolset>
30-
<WholeProgramOptimization>true</WholeProgramOptimization>
31-
<CharacterSet>Unicode</CharacterSet>
32-
</PropertyGroup>
33-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
34-
<ImportGroup Label="ExtensionSettings">
35-
</ImportGroup>
36-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
37-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
38-
<Import Project="windows_libraries.props" />
39-
<Import Project="portability_macros.props" />
40-
</ImportGroup>
41-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
42-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
43-
<Import Project="windows_libraries.props" />
44-
<Import Project="portability_macros.props" />
45-
</ImportGroup>
46-
<PropertyGroup Label="UserMacros" />
47-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
48-
<LinkIncremental>true</LinkIncremental>
49-
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
50-
<IntDir>$(OutDir)$(ProjectName)\</IntDir>
8+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
519
</PropertyGroup>
52-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
53-
<LinkIncremental>false</LinkIncremental>
54-
<OutDir>$(SolutionDir)$(Configuration)\$(Platform)\</OutDir>
55-
<IntDir>$(OutDir)$(ProjectName)\</IntDir>
10+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5611
</PropertyGroup>
57-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
58-
<ClCompile>
59-
<PrecompiledHeader>
60-
</PrecompiledHeader>
61-
<WarningLevel>Level3</WarningLevel>
62-
<Optimization>Disabled</Optimization>
63-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
64-
<AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
65-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
66-
<CallingConvention>VectorCall</CallingConvention>
67-
</ClCompile>
68-
<Link>
69-
<SubSystem>Console</SubSystem>
70-
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
71-
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
72-
</Link>
73-
</ItemDefinitionGroup>
74-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
75-
<ClCompile>
76-
<WarningLevel>Level3</WarningLevel>
77-
<PrecompiledHeader>
78-
</PrecompiledHeader>
79-
<Optimization>MaxSpeed</Optimization>
80-
<FunctionLevelLinking>true</FunctionLevelLinking>
81-
<IntrinsicFunctions>true</IntrinsicFunctions>
82-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83-
<AdditionalIncludeDirectories>$(SolutionDir)\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
84-
<WholeProgramOptimization>false</WholeProgramOptimization>
85-
<MultiProcessorCompilation>true</MultiProcessorCompilation>
86-
<CallingConvention>VectorCall</CallingConvention>
87-
</ClCompile>
88-
<Link>
89-
<SubSystem>Console</SubSystem>
90-
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
91-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
92-
<OptimizeReferences>true</OptimizeReferences>
93-
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
94-
</Link>
95-
</ItemDefinitionGroup>
12+
<Import Project="$(SolutionDir)benchmark.props" />
9613
<ItemGroup>
14+
<ClCompile Include="..\test\args_product_test.cc" />
9715
<ClCompile Include="..\test\basic_test.cc" />
9816
<ClCompile Include="..\test\benchmark_test.cc" />
9917
<ClCompile Include="..\test\fixture_test.cc" />
18+
<ClCompile Include="..\test\internal_threading_test.cc" />
19+
<ClCompile Include="..\test\link_main_test.cc" />
20+
<ClCompile Include="..\test\main.cpp" />
10021
<ClCompile Include="..\test\map_test.cc" />
10122
<ClCompile Include="..\test\multiple_ranges_test.cc" />
10223
<ClCompile Include="..\test\options_test.cc" />
@@ -107,7 +28,4 @@
10728
<Project>{ef4de73e-ee11-4128-93eb-60b07e650ef2}</Project>
10829
</ProjectReference>
10930
</ItemGroup>
110-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
111-
<ImportGroup Label="ExtensionTargets">
112-
</ImportGroup>
11331
</Project>

‎msvc/google-benchmark-test.vcxproj.filters‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,24 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="..\test\benchmark_test.cc">
18+
<ClCompile Include="..\test\args_product_test.cc">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
2121
<ClCompile Include="..\test\basic_test.cc">
2222
<Filter>Source Files</Filter>
2323
</ClCompile>
24+
<ClCompile Include="..\test\benchmark_test.cc">
25+
<Filter>Source Files</Filter>
26+
</ClCompile>
2427
<ClCompile Include="..\test\fixture_test.cc">
2528
<Filter>Source Files</Filter>
2629
</ClCompile>
30+
<ClCompile Include="..\test\internal_threading_test.cc">
31+
<Filter>Source Files</Filter>
32+
</ClCompile>
33+
<ClCompile Include="..\test\link_main_test.cc">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
2736
<ClCompile Include="..\test\map_test.cc">
2837
<Filter>Source Files</Filter>
2938
</ClCompile>
@@ -36,5 +45,8 @@
3645
<ClCompile Include="..\test\templated_fixture_test.cc">
3746
<Filter>Source Files</Filter>
3847
</ClCompile>
48+
<ClCompile Include="..\test\main.cpp">
49+
<Filter>Source Files</Filter>
50+
</ClCompile>
3951
</ItemGroup>
4052
</Project>

0 commit comments

Comments
 (0)