Reorganize directory structure; Separate builds to _Target

nieznanysprawiciel · Oct 13, 2024 · d9fd8d4 · d9fd8d4
1 parent aada7dc
commit d9fd8d4
Show file tree

Hide file tree

Showing 28 changed files with 149 additions and 252 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,10 @@
 swGUI/ProjectDir/Output/TMP/
-swCommonLib/.vs/
+
+_Target/*
+*/_Target
+
+*/.vs/
+*/.idea/
+
+.idea
+.vs 
diff --git a/swCommonLib/Projects/Visual2015/CommonBase/CommonBaseConfig.props b/swCommonLib/Projects/Visual2015/CommonBase/CommonBaseConfig.props
@@ -6,14 +6,14 @@
 
   <PropertyGroup Label="UserMacros">
     <CommonBaseName>CommonBase</CommonBaseName>
-    <CommonBaseLibDir>$(LibDir)$(CommonBaseName)\</CommonBaseLibDir>
+    <CommonBaseLibDir>$(LibDir)</CommonBaseLibDir>
     <CommonBaseSourceDir>$(SourceDir)$(CommonBaseName)\</CommonBaseSourceDir>
-    <CommonBaseFileName>$(CommonBaseName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</CommonBaseFileName>
-    <CommonBaseBuildDir>$(BuildDir)$(CommonBaseName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</CommonBaseBuildDir>
+    <CommonBaseFileName>$(CommonBaseName)</CommonBaseFileName>
+	<CommonBaseIntermediateDir>$(IntermediateDir)$(CommonBaseName)\</CommonBaseIntermediateDir>
   </PropertyGroup>
 
   <PropertyGroup>
-    <IntDir>$(CommonBaseBuildDir)</IntDir>
+    <IntDir>$(CommonBaseIntermediateDir)</IntDir>
     <TargetName>$(CommonBaseFileName)</TargetName>
     <OutDir>$(CommonBaseLibDir)</OutDir>
   </PropertyGroup>

diff --git a/...onLib/Projects/Visual2015/HierarchicalChunkedFormat/HierarchicalChunkedFormatConfig.props b/...onLib/Projects/Visual2015/HierarchicalChunkedFormat/HierarchicalChunkedFormatConfig.props
@@ -4,13 +4,13 @@
   <Import Project="..\Paths.props" />
   <PropertyGroup Label="UserMacros">
     <HierarchicalChunkedFormatName>HierarchicalChunkedFormat</HierarchicalChunkedFormatName>
-    <HierarchicalChunkedFormatLibDir>$(LibDir)$(HierarchicalChunkedFormatName)\</HierarchicalChunkedFormatLibDir>
+    <HierarchicalChunkedFormatLibDir>$(LibDir)</HierarchicalChunkedFormatLibDir>
     <HierarchicalChunkedFormatSourceDir>$(SourceDir)$(HierarchicalChunkedFormatName)\</HierarchicalChunkedFormatSourceDir>
-    <HierarchicalChunkedFormatFileName>$(HierarchicalChunkedFormatName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</HierarchicalChunkedFormatFileName>
-    <HierarchicalChunkedFormatBuildDir>$(BuildDir)$(HierarchicalChunkedFormatName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</HierarchicalChunkedFormatBuildDir>
+    <HierarchicalChunkedFormatFileName>$(HierarchicalChunkedFormatName)</HierarchicalChunkedFormatFileName>
+	<HierarchicalChunkedFormatIntermediateDir>$(IntermediateDir)$(HierarchicalChunkedFormatName)\</HierarchicalChunkedFormatIntermediateDir>
   </PropertyGroup>
   <PropertyGroup>
-    <IntDir>$(HierarchicalChunkedFormatBuildDir)</IntDir>
+    <IntDir>$(HierarchicalChunkedFormatIntermediateDir)</IntDir>
     <TargetName>$(HierarchicalChunkedFormatFileName)</TargetName>
     <OutDir>$(HierarchicalChunkedFormatLibDir)</OutDir>
   </PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/LinkReflection.props b/swCommonLib/Projects/Visual2015/LinkReflection.props
@@ -8,10 +8,10 @@
 
   <PropertyGroup Label="UserMacros">
     <ReflectionName>Reflection</ReflectionName>
-    <ReflectionLibDir>$(LibDir)$(ReflectionName)\$(PlatformToolset)\$(PlatformShortName)\$(Configuration)\</ReflectionLibDir>
+    <ReflectionLibDir>$(LibDir)</ReflectionLibDir>
     <ReflectionSourceDir>$(SourceDir)$(ReflectionName)\</ReflectionSourceDir>
     <ReflectionFileName>$(ReflectionName)</ReflectionFileName>
-    <ReflectionBuildDir>$(BuildDir)$(ReflectionName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</ReflectionBuildDir>
+    <ReflectionBuildDir>$(BuildDir)$(ReflectionName)</ReflectionBuildDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

diff --git a/swCommonLib/Projects/Visual2015/ParameterAnimation/ParameterAnimationConfig.props b/swCommonLib/Projects/Visual2015/ParameterAnimation/ParameterAnimationConfig.props
@@ -6,14 +6,14 @@
 
   <PropertyGroup Label="UserMacros">
     <ParameterAnimationName>ParameterAnimation</ParameterAnimationName>
-    <ParameterAnimationLibDir>$(LibDir)$(ParameterAnimationName)\</ParameterAnimationLibDir>
+    <ParameterAnimationLibDir>$(LibDir)</ParameterAnimationLibDir>
     <ParameterAnimationSourceDir>$(SourceDir)$(ParameterAnimationName)\</ParameterAnimationSourceDir>
-    <ParameterAnimationFileName>$(ParameterAnimationName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</ParameterAnimationFileName>
-    <ParameterAnimationBuildDir>$(BuildDir)$(ParameterAnimationName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</ParameterAnimationBuildDir>
+    <ParameterAnimationFileName>$(ParameterAnimationName)</ParameterAnimationFileName>
+    <ParameterAnimationIntDir>$(IntermediateDir)$(ParameterAnimationName)\</ParameterAnimationIntDir>
   </PropertyGroup>
 
   <PropertyGroup>
-    <IntDir>$(ParameterAnimationBuildDir)</IntDir>
+    <IntDir>$(ParameterAnimationIntDir)</IntDir>
     <TargetName>$(ParameterAnimationFileName)</TargetName>
     <OutDir>$(ParameterAnimationLibDir)</OutDir>
   </PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/Paths.props b/swCommonLib/Projects/Visual2015/Paths.props
@@ -3,15 +3,21 @@
   <ImportGroup Label="PropertySheets" />
 
   <PropertyGroup Label="UserMacros">
-	<RootDir>$(MSBuildThisFileDirectory)..\..\</RootDir>
-	<ProjectsDir>$(RootDir)Projects\</ProjectsDir>
-	<TestsDir>$(RootDir)Tests\</TestsDir>
-	<ReleaseDir>$(ProjectsDir)ReleaseDir\</ReleaseDir>
-	<LibDir>$(ReleaseDir)LibDir\</LibDir>
-	<BuildDir>$(ReleaseDir)BuildDir\</BuildDir>
-	<SourceInclude>$(RootDir)..\</SourceInclude>
-	<SourceDir>$(RootDir)</SourceDir>
-	<ExternalDir>$(RootDir)External\</ExternalDir>
+    <SubBuild>$(Configuration)-$(PlatformShortName)-$(PlatformToolset)</SubBuild>
+
+    <RootDir>$(MSBuildThisFileDirectory)..\..\</RootDir>
+    <ProjectsDir>$(RootDir)Projects\</ProjectsDir>
+    <ReleaseDir>$(RootDir)_Target\</ReleaseDir>
+
+    <LibDir>$(ReleaseDir)$(SubBuild)\LibDir\</LibDir>
+    <BuildDir>$(ReleaseDir)$(SubBuild)\BinDir\</BuildDir>
+    <IntermediateDir>$(ReleaseDir)$(SubBuild)\Intermediate\</IntermediateDir>
+    <TestsBinariesDir>$(ReleaseDir)$(SubBuild)\TestsDir\</TestsBinariesDir>
+
+    <SourceInclude>$(RootDir)..\</SourceInclude>
+    <SourceDir>$(RootDir)</SourceDir>
+    <TestsDir>$(RootDir)Tests\</TestsDir>
+    <ExternalDir>$(RootDir)External\</ExternalDir>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/Reflection/ReflectionConfig.props b/swCommonLib/Projects/Visual2015/Reflection/ReflectionConfig.props
@@ -6,10 +6,10 @@
 
   <PropertyGroup Label="UserMacros">
     <ReflectionName>Reflection</ReflectionName>
-    <ReflectionLibDir>$(LibDir)$(ReflectionName)\$(PlatformToolset)\$(PlatformShortName)\$(Configuration)\</ReflectionLibDir>
+    <ReflectionLibDir>$(LibDir)</ReflectionLibDir>
     <ReflectionSourceDir>$(SourceDir)$(ReflectionName)\</ReflectionSourceDir>
     <ReflectionFileName>$(ReflectionName)</ReflectionFileName>
-    <ReflectionBuildDir>$(BuildDir)$(ReflectionName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</ReflectionBuildDir>
+    <ReflectionIntDir>$(IntermediateDir)$(ReflectionName)\</ReflectionIntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
@@ -19,7 +19,7 @@
   </ItemDefinitionGroup>
 
   <PropertyGroup>
-    <IntDir>$(ReflectionBuildDir)</IntDir>
+    <IntDir>$(ReflectionIntDir)</IntDir>
     <TargetName>$(ReflectionFileName)</TargetName>
     <OutDir>$(ReflectionLibDir)</OutDir>
   </PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/Serialization/SerializationConfig.props b/swCommonLib/Projects/Visual2015/Serialization/SerializationConfig.props
@@ -6,14 +6,14 @@
 
   <PropertyGroup Label="UserMacros">
     <SerializationName>Serialization</SerializationName>
-    <SerializationLibDir>$(LibDir)$(SerializationName)\</SerializationLibDir>
+    <SerializationLibDir>$(LibDir)</SerializationLibDir>
     <SerializationSourceDir>$(SourceDir)$(SerializationName)\</SerializationSourceDir>
-    <SerializationFileName>$(SerializationName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</SerializationFileName>
-    <SerializationBuildDir>$(BuildDir)$(SerializationName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</SerializationBuildDir>
+    <SerializationFileName>$(SerializationName)</SerializationFileName>
+    <SerializationIntDir>$(IntermediateDir)$(SerializationName)\</SerializationIntDir>
   </PropertyGroup>
 
   <PropertyGroup>
-    <IntDir>$(SerializationBuildDir)</IntDir>
+    <IntDir>$(SerializationIntDir)</IntDir>
     <TargetName>$(SerializationFileName)</TargetName>
     <OutDir>$(SerializationLibDir)</OutDir>
   </PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/SerializerJSON/SerializerJsonConfig.props b/swCommonLib/Projects/Visual2015/SerializerJSON/SerializerJsonConfig.props
@@ -6,10 +6,10 @@
 
   <PropertyGroup Label="UserMacros">
     <SerializerJsonName>SerializerJson</SerializerJsonName>
-    <SerializerJsonLibDir>$(LibDir)$(SerializerJsonName)\</SerializerJsonLibDir>
+    <SerializerJsonLibDir>$(LibDir)</SerializerJsonLibDir>
     <SerializerJsonSourceDir>$(SourceDir)$(SerializerJsonName)\</SerializerJsonSourceDir>
-    <SerializerJsonFileName>$(SerializerJsonName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</SerializerJsonFileName>
-    <SerializerJsonBuildDir>$(BuildDir)$(SerializerJsonName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</SerializerJsonBuildDir>
+    <SerializerJsonFileName>$(SerializerJsonName)</SerializerJsonFileName>
+    <SerializerJsonIntDir>$(IntermediateDir)$(SerializerJsonName)\</SerializerJsonIntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
@@ -24,7 +24,7 @@
   </ItemDefinitionGroup>
 
   <PropertyGroup>
-    <IntDir>$(SerializerJsonBuildDir)</IntDir>
+    <IntDir>$(SerializerJsonIntDir)</IntDir>
     <TargetName>$(SerializerJsonFileName)</TargetName>
     <OutDir>$(SerializerJsonLibDir)</OutDir>
   </PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/SerializerXML/SerializerXMLConfig.props b/swCommonLib/Projects/Visual2015/SerializerXML/SerializerXMLConfig.props
@@ -6,10 +6,10 @@
 
   <PropertyGroup Label="UserMacros">
     <SerializerXMLName>SerializerXML</SerializerXMLName>
-    <SerializerXMLLibDir>$(LibDir)$(SerializerXMLName)\</SerializerXMLLibDir>
+    <SerializerXMLLibDir>$(LibDir)</SerializerXMLLibDir>
     <SerializerXMLSourceDir>$(SourceDir)$(SerializerXMLName)\</SerializerXMLSourceDir>
-    <SerializerXMLFileName>$(SerializerXMLName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</SerializerXMLFileName>
-    <SerializerXMLBuildDir>$(BuildDir)$(SerializerXMLName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</SerializerXMLBuildDir>
+    <SerializerXMLFileName>$(SerializerXMLName)</SerializerXMLFileName>
+    <SerializerXMLIntDir>$(IntermediateDir)$(SerializerXMLName)\</SerializerXMLIntDir>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
@@ -20,7 +20,7 @@
   </ItemDefinitionGroup>
 
   <PropertyGroup>
-    <IntDir>$(SerializerXMLBuildDir)</IntDir>
+    <IntDir>$(SerializerXMLIntDir)</IntDir>
     <TargetName>$(SerializerXMLFileName)</TargetName>
     <OutDir>$(SerializerXMLLibDir)</OutDir>
   </PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/TestClassHierarchy/TestClassHierarchyConfig.props b/swCommonLib/Projects/Visual2015/TestClassHierarchy/TestClassHierarchyConfig.props
@@ -6,14 +6,14 @@
 
   <PropertyGroup Label="UserMacros">
     <TestClassHierarchyName>TestClassHierarchy</TestClassHierarchyName>
-    <TestClassHierarchyLibDir>$(LibDir)$(TestClassHierarchyName)\</TestClassHierarchyLibDir>
+    <TestClassHierarchyLibDir>$(LibDir)</TestClassHierarchyLibDir>
     <TestClassHierarchySourceDir>$(SourceDir)$(TestClassHierarchyName)\</TestClassHierarchySourceDir>
-    <TestClassHierarchyFileName>$(TestClassHierarchyName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</TestClassHierarchyFileName>
-    <TestClassHierarchyBuildDir>$(BuildDir)$(TestClassHierarchyName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</TestClassHierarchyBuildDir>
+    <TestClassHierarchyFileName>$(TestClassHierarchyName)</TestClassHierarchyFileName>
+    <TestClassHierarchyIntDir>$(IntermediateDir)$(TestClassHierarchyName)\</TestClassHierarchyIntDir>
   </PropertyGroup>
 
   <PropertyGroup>
-    <IntDir>$(TestClassHierarchyBuildDir)</IntDir>
+    <IntDir>$(TestClassHierarchyIntDir)</IntDir>
     <TargetName>$(TestClassHierarchyFileName)</TargetName>
     <OutDir>$(TestClassHierarchyLibDir)</OutDir>
   </PropertyGroup>

diff --git a/swCommonLib/Projects/Visual2015/TestConfig.props b/swCommonLib/Projects/Visual2015/TestConfig.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+
+  <PropertyGroup Label="UserMacros">
+    <TestName>$(ProjectName)</TestName>
+    <TestSourceDir>$(SourceDir)$(TestName)\</TestSourceDir>
+    <TestFileName>$(TestName)</TestFileName>
+    <TestBuildDir>$(TestsBinariesDir)</TestBuildDir>
+    <TestIntermediateDir>$(IntermediateDir)$(TestName)\</TestIntermediateDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IntDir>$(TestIntermediateDir)</IntDir>
+    <TargetName>$(TestFileName)</TargetName>
+    <OutDir>$(TestBuildDir)</OutDir>
+  </PropertyGroup>
+
+</Project>
diff --git a/swCommonLib/Projects/Visual2015/Tests/BuffersTest/TestBuffers.vcxproj b/swCommonLib/Projects/Visual2015/Tests/BuffersTest/TestBuffers.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\Paths.props" />
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -62,6 +62,10 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <Import Project="..\..\Paths.props" />
+  <Import Project="..\..\TestConfig.props" />
+
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
@@ -155,18 +159,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <PropertyGroup Label="UserMacros">
-    <TestName>$(ProjectName)</TestName>
-    <TestLibDir>$(LibDir)$(TestName)\</TestLibDir>
-    <TestSourceDir>$(SourceDir)$(TestName)\</TestSourceDir>
-    <TestFileName>$(TestName)</TestFileName>
-    <TestBuildDir>$(BuildDir)$(TestName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</TestBuildDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IntDir>$(TestBuildDir)</IntDir>
-    <TargetName>$(TestFileName)</TargetName>
-    <OutDir>$(TestBuildDir)</OutDir>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/swCommonLib/Projects/Visual2015/Tests/FileSystemTest/FileSystemTest.vcxproj b/swCommonLib/Projects/Visual2015/Tests/FileSystemTest/FileSystemTest.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\Paths.props" />
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -61,7 +61,11 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+
+  <Import Project="..\..\Paths.props" />
+  <Import Project="..\..\TestConfig.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
@@ -151,18 +155,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <PropertyGroup Label="UserMacros">
-    <TestName>$(ProjectName)</TestName>
-    <TestLibDir>$(LibDir)$(TestName)\</TestLibDir>
-    <TestSourceDir>$(SourceDir)$(TestName)\</TestSourceDir>
-    <TestFileName>$(TestName)</TestFileName>
-    <TestBuildDir>$(BuildDir)$(TestName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</TestBuildDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IntDir>$(TestBuildDir)</IntDir>
-    <TargetName>$(TestFileName)</TargetName>
-    <OutDir>$(TestBuildDir)</OutDir>
-  </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/swCommonLib/Projects/Visual2015/Tests/MultithreadingTest/MultithreadingTest.vcxproj b/swCommonLib/Projects/Visual2015/Tests/MultithreadingTest/MultithreadingTest.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\Paths.props" />
+
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -33,7 +33,9 @@
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -60,6 +62,10 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+
+  <Import Project="..\..\Paths.props" />
+  <Import Project="..\..\TestConfig.props" />
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -150,18 +156,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <PropertyGroup Label="UserMacros">
-    <TestName>$(ProjectName)</TestName>
-    <TestLibDir>$(LibDir)$(TestName)\</TestLibDir>
-    <TestSourceDir>$(SourceDir)$(TestName)\</TestSourceDir>
-    <TestFileName>$(TestName)</TestFileName>
-    <TestBuildDir>$(BuildDir)$(TestName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</TestBuildDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IntDir>$(TestBuildDir)</IntDir>
-    <TargetName>$(TestFileName)</TargetName>
-    <OutDir>$(TestBuildDir)</OutDir>
-  </PropertyGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/swCommonLib/Projects/Visual2015/Tests/PluginTestRTTR/PluginTestRTTR.vcxproj b/swCommonLib/Projects/Visual2015/Tests/PluginTestRTTR/PluginTestRTTR.vcxproj
@@ -70,10 +70,10 @@
   <Import Project="..\..\Paths.props" />
   <PropertyGroup Label="UserMacros">
     <PluginTestRTTRName>PluginTestRTTR</PluginTestRTTRName>
-    <PluginTestRTTRLibDir>$(LibDir)$(PluginTestRTTRName)\</PluginTestRTTRLibDir>
+    <PluginTestRTTRLibDir>$(LibDir)</PluginTestRTTRLibDir>
     <PluginTestRTTRSourceDir>$(SourceDir)$(PluginTestRTTRName)\</PluginTestRTTRSourceDir>
-    <PluginTestRTTRFileName>$(PluginTestRTTRName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)</PluginTestRTTRFileName>
-    <PluginTestRTTRBuildDir>$(BuildDir)$(PluginTestRTTRName)_$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</PluginTestRTTRBuildDir>
+    <PluginTestRTTRFileName>$(PluginTestRTTRName)</PluginTestRTTRFileName>
+    <PluginTestRTTRBuildDir>$(IntermediateDir)$(PluginTestRTTRName)\</PluginTestRTTRBuildDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>