Skip to content

Commit 2ad4986

Browse files
bgoglinbgoglin
committed
contrib/windows: move dependencies to each tool vcxproj file
Instead of having all of them in the main solution file. Thanks to Eloi Gaudry for the patch. Signed-off-by: Brice Goglin <[email protected]>
1 parent 768093c commit 2ad4986

12 files changed

+66
-33
lines changed

‎contrib/windows/hwloc-annotate.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@
8686
<ClInclude Include="..\..\include\private\xml.h" />
8787
<ClInclude Include="..\..\utils\hwloc\misc.h" />
8888
</ItemGroup>
89+
<ItemGroup>
90+
<ProjectReference Include="libhwloc.vcxproj">
91+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
92+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
93+
</ProjectReference>
94+
</ItemGroup>
8995
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9096
<ImportGroup Label="ExtensionTargets">
9197
</ImportGroup>

‎contrib/windows/hwloc-bind.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@
8787
<ClInclude Include="..\..\utils\hwloc\misc.h" />
8888
<ClInclude Include="..\..\utils\hwloc\hwloc-calc.h" />
8989
</ItemGroup>
90+
<ItemGroup>
91+
<ProjectReference Include="libhwloc.vcxproj">
92+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
93+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
94+
</ProjectReference>
95+
</ItemGroup>
9096
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9197
<ImportGroup Label="ExtensionTargets">
9298
</ImportGroup>

‎contrib/windows/hwloc-calc.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@
8787
<ClInclude Include="..\..\utils\hwloc\misc.h" />
8888
<ClInclude Include="..\..\utils\hwloc\hwloc-calc.h" />
8989
</ItemGroup>
90+
<ItemGroup>
91+
<ProjectReference Include="libhwloc.vcxproj">
92+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
93+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
94+
</ProjectReference>
95+
</ItemGroup>
9096
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9197
<ImportGroup Label="ExtensionTargets">
9298
</ImportGroup>

‎contrib/windows/hwloc-diff.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@
8585
<ClInclude Include="..\..\include\private\private.h" />
8686
<ClInclude Include="..\..\include\private\xml.h" />
8787
</ItemGroup>
88+
<ItemGroup>
89+
<ProjectReference Include="libhwloc.vcxproj">
90+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
91+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
92+
</ProjectReference>
93+
</ItemGroup>
8894
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
8995
<ImportGroup Label="ExtensionTargets">
9096
</ImportGroup>

‎contrib/windows/hwloc-distrib.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@
8686
<ClInclude Include="..\..\include\private\xml.h" />
8787
<ClInclude Include="..\..\utils\hwloc\misc.h" />
8888
</ItemGroup>
89+
<ItemGroup>
90+
<ProjectReference Include="libhwloc.vcxproj">
91+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
92+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
93+
</ProjectReference>
94+
</ItemGroup>
8995
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9096
<ImportGroup Label="ExtensionTargets">
9197
</ImportGroup>

‎contrib/windows/hwloc-gather-cpuid.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
<ClInclude Include="..\..\include\hwloc.h" />
7676
<ClInclude Include="..\..\include\private\cpuid-x86.h" />
7777
</ItemGroup>
78+
<ItemGroup>
79+
<ProjectReference Include="libhwloc.vcxproj">
80+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
81+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
82+
</ProjectReference>
83+
</ItemGroup>
7884
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
7985
<ImportGroup Label="ExtensionTargets">
8086
</ImportGroup>

‎contrib/windows/hwloc-info.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@
8787
<ClInclude Include="..\..\utils\hwloc\misc.h" />
8888
<ClInclude Include="..\..\utils\hwloc\hwloc-calc.h" />
8989
</ItemGroup>
90+
<ItemGroup>
91+
<ProjectReference Include="libhwloc.vcxproj">
92+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
93+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
94+
</ProjectReference>
95+
</ItemGroup>
9096
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9197
<ImportGroup Label="ExtensionTargets">
9298
</ImportGroup>

‎contrib/windows/hwloc-patch.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@
8585
<ClInclude Include="..\..\include\private\private.h" />
8686
<ClInclude Include="..\..\include\private\xml.h" />
8787
</ItemGroup>
88+
<ItemGroup>
89+
<ProjectReference Include="libhwloc.vcxproj">
90+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
91+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
92+
</ProjectReference>
93+
</ItemGroup>
8894
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
8995
<ImportGroup Label="ExtensionTargets">
9096
</ImportGroup>

‎contrib/windows/hwloc.sln

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhwloc", "libhwloc.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB8D}"
55
EndProject
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lstopo-no-graphics", "lstopo-no-graphics.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB8E}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
9-
EndProjectSection
107
EndProject
118
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-annotate", "hwloc-annotate.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB8F}"
12-
ProjectSection(ProjectDependencies) = postProject
13-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
14-
EndProjectSection
159
EndProject
1610
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-bind", "hwloc-bind.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB91}"
17-
ProjectSection(ProjectDependencies) = postProject
18-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
19-
EndProjectSection
2011
EndProject
2112
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-calc", "hwloc-calc.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB92}"
22-
ProjectSection(ProjectDependencies) = postProject
23-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
24-
EndProjectSection
2513
EndProject
2614
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-diff", "hwloc-diff.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB93}"
27-
ProjectSection(ProjectDependencies) = postProject
28-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
29-
EndProjectSection
3015
EndProject
3116
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-distrib", "hwloc-distrib.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB95}"
32-
ProjectSection(ProjectDependencies) = postProject
33-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
34-
EndProjectSection
3517
EndProject
3618
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-info", "hwloc-info.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB96}"
37-
ProjectSection(ProjectDependencies) = postProject
38-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
39-
EndProjectSection
4019
EndProject
4120
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-patch", "hwloc-patch.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB97}"
42-
ProjectSection(ProjectDependencies) = postProject
43-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
44-
EndProjectSection
4521
EndProject
4622
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lstopo", "lstopo.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB98}"
47-
ProjectSection(ProjectDependencies) = postProject
48-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
49-
EndProjectSection
5023
EndProject
5124
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lstopo-win", "lstopo-win.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB99}"
52-
ProjectSection(ProjectDependencies) = postProject
53-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
54-
EndProjectSection
5525
EndProject
5626
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-gather-cpuid", "hwloc-gather-cpuid.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB9A}"
57-
ProjectSection(ProjectDependencies) = postProject
58-
{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
59-
EndProjectSection
6027
EndProject
6128
Global
6229
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎contrib/windows/lstopo-no-graphics.vcxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@
9595
<ClInclude Include="..\..\utils\hwloc\common-ps.h" />
9696
<ClInclude Include="..\..\utils\lstopo\lstopo.h" />
9797
</ItemGroup>
98+
<ItemGroup>
99+
<ProjectReference Include="libhwloc.vcxproj">
100+
<Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
101+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
102+
</ProjectReference>
103+
</ItemGroup>
98104
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
99105
<ImportGroup Label="ExtensionTargets">
100106
</ImportGroup>

0 commit comments

Comments
 (0)