Skip to content

Commit 4e22760

Browse files
committed
Fix windows build
1 parent ce921ba commit 4e22760

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

profiler/Directory.Build.targets

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
</Link>
1414
</ItemDefinitionGroup>
1515

16-
<PropertyGroup>
17-
<NativeWindowsDeployFilesSrcDir>$(BaseOutputPath)\$(ConfigBasedRelativeOutputPath)\profiler\src\ProfilerEngine\Datadog.Profiler.Native.Windows</NativeWindowsDeployFilesSrcDir>
18-
<NativeLinuxDeployFilesSrcDir>$(BaseOutputPath)\$(ConfigBasedRelativeOutputPath)\profiler\src\ProfilerEngine\Datadog.Profiler.Native.Linux</NativeLinuxDeployFilesSrcDir>
19-
20-
</PropertyGroup>
21-
2216
<PropertyGroup>
2317
<TopLevelDeployDirectoryBase Condition="'$(DeployToMonitoringHome)' == 'True'">$(EnlistmentRoot)\shared\bin\monitoring-home</TopLevelDeployDirectoryBase>
2418
<TopLevelDeployDirectoryBase Condition="'$(DeployToMonitoringHome)' != 'True'">$(BuildOutputRoot)\DDProf-Deploy</TopLevelDeployDirectoryBase>
@@ -33,24 +27,25 @@
3327
<DeployDirectoryBase >$(TopLevelDeployDirectoryBase)\$(DDPlatform)</DeployDirectoryBase>
3428
</PropertyGroup>
3529

30+
<PropertyGroup>
31+
<NativeWindowsDeployFilesSrcDir>$(BaseOutputPath)\$(ConfigBasedRelativeOutputPath)\profiler\src\ProfilerEngine\Datadog.Profiler.Native.Windows</NativeWindowsDeployFilesSrcDir>
32+
<NativeLinuxDeployFilesSrcDir>$(BaseOutputPath)\$(ConfigBasedRelativeOutputPath)\profiler\src\ProfilerEngine\Datadog.Profiler.Native.Linux</NativeLinuxDeployFilesSrcDir>
33+
</PropertyGroup>
34+
3635
<Target Name="CopyVcpkgPDBs" AfterTargets="Build">
36+
<Message Text="[PrepareDeployDirectory] NativeWindowsDeployFilesSrcDir: '$(NativeWindowsDeployFilesSrcDir)'" Importance="high" />
37+
<Message Text="[PrepareDeployDirectory] NativeLinuxDeployFilesSrcDir: '$(NativeLinuxDeployFilesSrcDir)'" Importance="high" />
3738
<ItemGroup>
3839
<VcpkgPDBs Condition="'$(Configuration)'=='Release'" Include="$(VcpkgInstalledDir)\$(VcpkgTriplet)\bin\*.pdb" />
3940
<VcpkgPDBs Condition="'$(Configuration)'=='Debug'" Include="$(VcpkgInstalledDir)\$(VcpkgTriplet)\debug\bin\*.pdb" />
4041
</ItemGroup>
4142
<Copy SourceFiles="@(VcpkgPDBs)" DestinationFiles="@(VcpkgPDBs->'$(DeployDirectoryBase)\%(RecursiveDir)%(Filename)%(Extension)')" />
4243
<Copy SourceFiles="@(VcpkgPDBs)" DestinationFiles="@(VcpkgPDBs->'$(NativeWindowsDeployFilesSrcDir)\%(Filename)%(Extension)')" />
4344
</Target>
44-
<Target Name="CleanVcpkPDBs" BeforeTargets="_CleanGetCurrentAndPriorFileWrites">
45+
<Target Name="CleanVcpkPDBs" AfterTargets="Clean">
4546
<ItemGroup>
4647
<PDBsToDelete Include="$(NativeWindowsDeployFilesSrcDir)\*.pdb" />
4748
</ItemGroup>
4849
<Delete Files="@(PDBsToDelete)" />
4950
</Target>
50-
<PropertyGroup>
51-
<CleanDependsOn>
52-
$(CleanDependsOn);
53-
CleanVcpkPDBs
54-
</CleanDependsOn>
55-
</PropertyGroup>
5651
</Project>

profiler/src/ProfilerEngine/Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
</AssemblyAttribute>
2929
</ItemGroup>
3030
</Target>
31-
3231
<Target Name="PrepareDeployDirectory" AfterTargets="Build">
3332

3433
<ItemGroup>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="gmock" version="1.11.0" targetFramework="native" />
4+
<package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.7" targetFramework="native" />
5+
</packages>

0 commit comments

Comments
 (0)