Skip to content

Commit 3edb3e9

Browse files
chesik-amdchesik-amd
committed
More project file updates to support changes related to moving non-opensource files out of Perforce and into separate git.amd.com repos
1 parent c24fa99 commit 3edb3e9

11 files changed

+38
-39
lines changed

‎Build/VS2015/GPA-Properties.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Label="UserMacros">
4-
<BaseDir Condition="'$(SolutionName)'=='GPUPerfAPI'">$(SolutionDir)..\..\..\</BaseDir>
5-
<BaseDir Condition="'$(SolutionName)'!='GPUPerfAPI'">$(SolutionDir)..\..\..\..\</BaseDir>
4+
<BaseDir>$(SolutionDir)..\..\..\</BaseDir>
65
<GPUPerfAPIBaseDir>$(BaseDir)GPA\</GPUPerfAPIBaseDir>
76
<CommonDir>$(BaseDir)Common\</CommonDir>
87
</PropertyGroup>

‎Build/VS2015/GPUPerfAPI-Common.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<ItemGroup>
5050
<ClCompile Include="..\..\..\Common\Src\ADLUtil\ADLUtil.cpp" />
5151
<ClCompile Include="..\..\..\Common\Src\AMDTMutex\AMDTMutex.cpp" />
52-
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\Common\Src\DeviceInfo\DeviceInfoInternal.cpp" />
52+
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\Common\Src\DeviceInfo-Internal\DeviceInfoInternal.cpp" />
5353
<ClCompile Include="..\..\..\Common\Src\DeviceInfo\DeviceInfoUtils.cpp" />
5454
<ClCompile Include="..\..\..\Common\Src\DynamicLibraryModule\DynamicLibraryModule.cpp" />
5555
<ClCompile Include="..\..\..\Common\Src\GPUPerfAPIUtils\GPUPerfAPIRegistry.cpp" />

‎Build/VS2015/GPUPerfAPI-Common.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<ClCompile Include="..\..\..\Common\Src\AMDTMutex\AMDTMutex.cpp">
127127
<Filter>CommonSrc</Filter>
128128
</ClCompile>
129-
<ClCompile Include="..\..\..\Common\Src\DeviceInfo\DeviceInfoInternal.cpp">
129+
<ClCompile Include="..\..\..\Common\Src\DeviceInfo-Internal\DeviceInfoInternal.cpp">
130130
<Filter>CommonSrc</Filter>
131131
</ClCompile>
132132
<ClCompile Include="..\..\..\Common\Src\DeviceInfo\DeviceInfoUtils.cpp">

‎Build/VS2015/GPUPerfAPICL.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
<Import Project="GPA-Common.props" />
3939
<Import Project="GPA-DLL.props" />
40-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable-CodeXL.props" />
41-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable.props" />
42-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Internal.props" />
40+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable-CodeXL.props" />
41+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable.props" />
42+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Internal.props" />
4343
</ImportGroup>
4444
<PropertyGroup Label="UserMacros" />
4545
<PropertyGroup>

‎Build/VS2015/GPUPerfAPICounterGenerator.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@
102102
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI'" Include="..\..\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx8.cpp">
103103
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
104104
</ClCompile>
105-
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.cpp" />
106-
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx6.cpp" />
107-
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx7.cpp">
105+
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.cpp" />
106+
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx6.cpp" />
107+
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx7.cpp">
108108
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
109109
</ClCompile>
110-
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx8.cpp">
110+
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx8.cpp">
111111
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
112112
</ClCompile>
113113
<ClCompile Include="..\..\Src\GPUPerfAPICounterGenerator\GPAPublicCounters.cpp" />

‎Build/VS2015/GPUPerfAPICounterGenerator.vcxproj.filters

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@
9696
<ClInclude Include="..\..\Src\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.h">
9797
<Filter>Source Files\InternalCounters</Filter>
9898
</ClInclude>
99-
<ClInclude Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx6.h">
99+
<ClInclude Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx6.h">
100100
<Filter>Source Files\InternalCounters</Filter>
101101
</ClInclude>
102-
<ClInclude Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx7.h">
102+
<ClInclude Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx7.h">
103103
<Filter>Source Files\InternalCounters</Filter>
104104
</ClInclude>
105-
<ClInclude Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx8.h">
105+
<ClInclude Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx8.h">
106106
<Filter>Source Files\InternalCounters</Filter>
107107
</ClInclude>
108-
<ClInclude Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.h">
108+
<ClInclude Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.h">
109109
<Filter>Source Files\InternalCounters</Filter>
110110
</ClInclude>
111111
<ClInclude Include="..\..\Src\GPUPerfAPICounterGenerator\InternalCountersCLGfx6.h">
@@ -281,16 +281,16 @@
281281
<ClCompile Include="..\..\Src\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.cpp">
282282
<Filter>Source Files\InternalCounters</Filter>
283283
</ClCompile>
284-
<ClCompile Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx6.cpp">
284+
<ClCompile Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx6.cpp">
285285
<Filter>Source Files\InternalCounters</Filter>
286286
</ClCompile>
287-
<ClCompile Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx7.cpp">
287+
<ClCompile Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx7.cpp">
288288
<Filter>Source Files\InternalCounters</Filter>
289289
</ClCompile>
290-
<ClCompile Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersGfx8.cpp">
290+
<ClCompile Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersGfx8.cpp">
291291
<Filter>Source Files\InternalCounters</Filter>
292292
</ClCompile>
293-
<ClCompile Include="..\..\Non-OpenSource\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.cpp">
293+
<ClCompile Include="..\..\..\GPA-Internal\Src\GPUPerfAPICounterGenerator\GPAInternalCountersFiji.cpp">
294294
<Filter>Source Files\InternalCounters</Filter>
295295
</ClCompile>
296296
<ClCompile Include="..\..\Src\GPUPerfAPICounterGenerator\InternalCountersCLGfx6.cpp">

‎Build/VS2015/GPUPerfAPICounters.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3939
<Import Project="GPA-Common.props" />
4040
<Import Project="GPA-DLL.props" />
41-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable-CodeXL.props" />
42-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable.props" />
43-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Internal.props" />
41+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable-CodeXL.props" />
42+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable.props" />
43+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Internal.props" />
4444
</ImportGroup>
4545
<ItemGroup>
4646
<ClCompile Include="..\..\Src\GPUPerfAPICounters\GPUPerfAPICounters.cpp" />

‎Build/VS2015/GPUPerfAPIDX11.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
<Import Project="GPA-Common.props" />
3939
<Import Project="GPA-DLL.props" />
4040
<Import Condition="'$(SolutionName)'=='GPUPerfAPI'" Project="$(CommonDir)/Lib/AMD/GPUPerfAPI/Global-GPUPerfAPI.props" />
41-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable-CodeXL.props" />
42-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable-PerfStudio.props" />
43-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable.props" />
44-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Internal.props" />
41+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable-CodeXL.props" />
42+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable-PerfStudio.props" />
43+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable.props" />
44+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Internal.props" />
4545
</ImportGroup>
4646
<PropertyGroup Label="UserMacros" />
4747
<PropertyGroup>
@@ -70,7 +70,7 @@
7070
<ClCompile Include="..\..\Src\GPUPerfAPIDX11\DxxExtUtils.cpp" />
7171
<ClCompile Include="..\..\Src\GPUPerfAPIDX11\GPAContextStateDX11.cpp" />
7272
<ClCompile Include="..\..\Src\GPUPerfAPIDX11\GPUPerfAPIDX11.cpp" />
73-
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\GPUPerfAPIInternalRegistration\DX11GPAInternalCounterGeneratorRegistration.cpp" />
73+
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Src\GPUPerfAPIInternalRegistration\DX11GPAInternalCounterGeneratorRegistration.cpp" />
7474
</ItemGroup>
7575
<ItemGroup>
7676
<ClInclude Include="..\..\..\Common\Src\AmdDxExt\AmdDxExt.h" />
@@ -93,7 +93,7 @@
9393
<ResourceCompile Include="..\..\Src\GPUPerfAPIDX11\GPUPerfAPIDX11.rc" />
9494
</ItemGroup>
9595
<ItemGroup>
96-
<ProjectReference Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\Build\VS2015\GPUPerfAPINVPerfkit.vcxproj">
96+
<ProjectReference Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Build\VS2015\GPUPerfAPINVPerfkit.vcxproj">
9797
<Project>{918f0693-23f7-473a-82c5-f832039bec45}</Project>
9898
</ProjectReference>
9999
<ProjectReference Include="GPUPerfAPI-Common.vcxproj">

‎Build/VS2015/GPUPerfAPIDX12.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
<Import Project="GPA-Common.props" />
3939
<Import Project="GPA-DLL.props" />
40-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable-PerfStudio.props" />
41-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable.props" />
42-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Internal.props" />
40+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable-PerfStudio.props" />
41+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable.props" />
42+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Internal.props" />
4343
</ImportGroup>
4444
<ItemDefinitionGroup>
4545
<ClCompile>

‎Build/VS2015/GPUPerfAPIGL.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3838
<Import Project="GPA-Common.props" />
3939
<Import Project="GPA-DLL.props" />
40-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable-PerfStudio.props" />
41-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Deliverable.props" />
42-
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="../../Non-OpenSource/Build/VS2015/GPA-Internal.props" />
40+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable-PerfStudio.props" />
41+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Deliverable.props" />
42+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="$(BaseDir)GPA-Internal/Build/VS2015/GPA-Internal.props" />
4343
</ImportGroup>
4444
<PropertyGroup Label="UserMacros" />
4545
<PropertyGroup>
@@ -64,7 +64,7 @@
6464
<ClCompile Include="..\..\Src\GPUPerfAPIGL\GLCounterDataRequestManager.cpp" />
6565
<ClCompile Include="..\..\Src\GPUPerfAPIGL\GLPerfMonitorCache.cpp" />
6666
<ClCompile Include="..\..\Src\GPUPerfAPIGL\GPUPerfAPIGL.cpp" />
67-
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\GPUPerfAPIInternalRegistration\GLGPAInternalCounterGeneratorRegistration.cpp" />
67+
<ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Src\GPUPerfAPIInternalRegistration\GLGPAInternalCounterGeneratorRegistration.cpp" />
6868
</ItemGroup>
6969
<ItemGroup>
7070
<ClInclude Include="..\..\Src\GPUPerfAPIGL\ASICInfo.h" />
@@ -76,7 +76,7 @@
7676
<ClInclude Include="..\..\Src\GPUPerfAPIGL\resource.h" />
7777
</ItemGroup>
7878
<ItemGroup>
79-
<ProjectReference Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\Non-OpenSource\Build\VS2015\GPUPerfAPINVPerfkit.vcxproj">
79+
<ProjectReference Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\GPA-Internal\Build\VS2015\GPUPerfAPINVPerfkit.vcxproj">
8080
<Project>{918f0693-23f7-473a-82c5-f832039bec45}</Project>
8181
</ProjectReference>
8282
<ProjectReference Include="GPUPerfAPI-Common.vcxproj">

0 commit comments

Comments
 (0)