TargetName

mockingbirdnest · Jan 14, 2018 · 5517987 · 5517987
1 parent 546947b
commit 5517987
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/google_benchmark.props b/google_benchmark.props
@@ -2,9 +2,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\Google\benchmark\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

diff --git a/principia.props b/principia.props
@@ -130,12 +130,6 @@
   <Import Project="$(SolutionDir)google_glog.props" />
   <Import Project="$(SolutionDir)generate_version_translation_unit.props" />
 
-  <ImportGroup Condition="$(PrincipiaTestProject)">
-    <Import Project="$(SolutionDir)..\Google\googletest\googletest\msvc\portability_macros.props" />
-    <Import Project="$(SolutionDir)google_googletest.props" />
-    <Import Project="$(SolutionDir)google_googlemock_main.props" />
-  </ImportGroup>
-
   <ImportGroup Condition="$(ProjectName) == benchmarks or
                           $(ProjectName) == ksp_plugin_test or
                           $(ProjectName) == journal">
@@ -144,6 +138,12 @@
     <Import Project="$(SolutionDir)google_benchmark.props" />
   </ImportGroup>
 
+  <ImportGroup Condition="$(PrincipiaTestProject)">
+    <Import Project="$(SolutionDir)..\Google\googletest\googletest\msvc\portability_macros.props" />
+    <Import Project="$(SolutionDir)google_googletest.props" />
+    <Import Project="$(SolutionDir)google_googlemock_main.props" />
+  </ImportGroup>
+
   <!--Tools.-->
   <PropertyGroup>
     <!--Protocompiler.-->