Skip to content

Commit 335eb32

Browse files
authored
Merge pull request #4149 from eggrobin/nanobenchmarks-is-not-a-test
nanobenchmarks is not a test
2 parents ef5a706 + 9b9940e commit 335eb32

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

‎nanobenchmarks/nanobenchmarks.vcxproj‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,14 @@
44
<VCProjectVersion>17.0</VCProjectVersion>
55
<ProjectGuid>{1c6654c0-14e2-4a9e-b0e6-508b84fa8a0e}</ProjectGuid>
66
<RootNamespace>nanobenchmarks</RootNamespace>
7-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
87
</PropertyGroup>
8+
<Import Project="$(SolutionDir)principia.props" />
99
<ImportGroup Label="ExtensionSettings">
1010
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
1111
</ImportGroup>
12-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
13-
<Link>
14-
<AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
15-
</Link>
16-
</ItemDefinitionGroup>
17-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
12+
<ItemDefinitionGroup>
1813
<Link>
19-
<AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
20-
</Link>
21-
</ItemDefinitionGroup>
22-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LLVM|x64'">
23-
<Link>
24-
<AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
14+
<AdditionalDependencies>powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
2515
</Link>
2616
</ItemDefinitionGroup>
2717
<ItemGroup>
@@ -42,7 +32,6 @@
4232
<ImportGroup Label="ExtensionTargets">
4333
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
4434
</ImportGroup>
45-
<Import Project="$(SolutionDir)principia.props" />
4635
<ImportGroup Label="Shared">
4736
<Import Project="..\shared\base.vcxitems" Label="Shared" />
4837
<Import Project="..\shared\numerics.vcxitems" Label="Shared" />

‎principia.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<PrincipiaTestProject Condition="$(ProjectName) == ksp_plugin or
3535
$(ProjectName) == serialization or
3636
$(ProjectName) == benchmarks or
37+
$(ProjectName) == nanobenchmarks or
3738
$(ProjectName) == tools">false</PrincipiaTestProject>
3839
<!--Dependency paths.-->
3940
<PrincipiaDependencyConfiguration>Debug</PrincipiaDependencyConfiguration>

0 commit comments

Comments
 (0)