Merge pull request #4149 from eggrobin/nanobenchmarks-is-not-a-test

nanobenchmarks is not a test
mockingbirdnest · Dec 30, 2024 · 335eb32 · 335eb32
2 parents ef5a706 + 9b9940e
commit 335eb32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/nanobenchmarks/nanobenchmarks.vcxproj b/nanobenchmarks/nanobenchmarks.vcxproj
@@ -4,24 +4,14 @@
     <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectGuid>{1c6654c0-14e2-4a9e-b0e6-508b84fa8a0e}</ProjectGuid>
     <RootNamespace>nanobenchmarks</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)principia.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LLVM|x64'">
-    <Link>
-      <AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -42,7 +32,6 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-  <Import Project="$(SolutionDir)principia.props" />
   <ImportGroup Label="Shared">
     <Import Project="..\shared\base.vcxitems" Label="Shared" />
     <Import Project="..\shared\numerics.vcxitems" Label="Shared" />

diff --git a/principia.props b/principia.props
@@ -34,6 +34,7 @@
     <PrincipiaTestProject Condition="$(ProjectName) == ksp_plugin or
                                      $(ProjectName) == serialization or
                                      $(ProjectName) == benchmarks or
+                                     $(ProjectName) == nanobenchmarks or
                                      $(ProjectName) == tools">false</PrincipiaTestProject>
     <!--Dependency paths.-->
     <PrincipiaDependencyConfiguration>Debug</PrincipiaDependencyConfiguration>