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 <Brice.Goglin@inria.fr>
open-mpi · Sep 25, 2019 · 2ad4986 · 2ad4986
1 parent 768093c
commit 2ad4986
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 33 deletions.
diff --git a/contrib/windows/hwloc-annotate.vcxproj b/contrib/windows/hwloc-annotate.vcxproj
@@ -86,6 +86,12 @@
     <ClInclude Include="..\..\include\private\xml.h" />
     <ClInclude Include="..\..\utils\hwloc\misc.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc-bind.vcxproj b/contrib/windows/hwloc-bind.vcxproj
@@ -87,6 +87,12 @@
     <ClInclude Include="..\..\utils\hwloc\misc.h" />
     <ClInclude Include="..\..\utils\hwloc\hwloc-calc.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc-calc.vcxproj b/contrib/windows/hwloc-calc.vcxproj
@@ -87,6 +87,12 @@
     <ClInclude Include="..\..\utils\hwloc\misc.h" />
     <ClInclude Include="..\..\utils\hwloc\hwloc-calc.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc-diff.vcxproj b/contrib/windows/hwloc-diff.vcxproj
@@ -85,6 +85,12 @@
     <ClInclude Include="..\..\include\private\private.h" />
     <ClInclude Include="..\..\include\private\xml.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc-distrib.vcxproj b/contrib/windows/hwloc-distrib.vcxproj
@@ -86,6 +86,12 @@
     <ClInclude Include="..\..\include\private\xml.h" />
     <ClInclude Include="..\..\utils\hwloc\misc.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc-gather-cpuid.vcxproj b/contrib/windows/hwloc-gather-cpuid.vcxproj
@@ -75,6 +75,12 @@
     <ClInclude Include="..\..\include\hwloc.h" />
     <ClInclude Include="..\..\include\private\cpuid-x86.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc-info.vcxproj b/contrib/windows/hwloc-info.vcxproj
@@ -87,6 +87,12 @@
     <ClInclude Include="..\..\utils\hwloc\misc.h" />
     <ClInclude Include="..\..\utils\hwloc\hwloc-calc.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc-patch.vcxproj b/contrib/windows/hwloc-patch.vcxproj
@@ -85,6 +85,12 @@
     <ClInclude Include="..\..\include\private\private.h" />
     <ClInclude Include="..\..\include\private\xml.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/hwloc.sln b/contrib/windows/hwloc.sln
@@ -4,59 +4,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhwloc", "libhwloc.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB8D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lstopo-no-graphics", "lstopo-no-graphics.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB8E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-annotate", "hwloc-annotate.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB8F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-bind", "hwloc-bind.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB91}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-calc", "hwloc-calc.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB92}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-diff", "hwloc-diff.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB93}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-distrib", "hwloc-distrib.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB95}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-info", "hwloc-info.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB96}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-patch", "hwloc-patch.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB97}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lstopo", "lstopo.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB98}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lstopo-win", "lstopo-win.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB99}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hwloc-gather-cpuid", "hwloc-gather-cpuid.vcxproj", "{9DE76C6D-4773-4766-9F93-69C56166CB9A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9DE76C6D-4773-4766-9F93-69C56166CB8D} = {9DE76C6D-4773-4766-9F93-69C56166CB8D}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/contrib/windows/lstopo-no-graphics.vcxproj b/contrib/windows/lstopo-no-graphics.vcxproj
@@ -95,6 +95,12 @@
     <ClInclude Include="..\..\utils\hwloc\common-ps.h" />
     <ClInclude Include="..\..\utils\lstopo\lstopo.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/lstopo-win.vcxproj b/contrib/windows/lstopo-win.vcxproj
@@ -97,6 +97,12 @@
     <ClInclude Include="..\..\utils\hwloc\common-ps.h" />
     <ClInclude Include="..\..\utils\lstopo\lstopo.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/contrib/windows/lstopo.vcxproj b/contrib/windows/lstopo.vcxproj
@@ -96,6 +96,12 @@
     <ClInclude Include="..\..\utils\hwloc\common-ps.h" />
     <ClInclude Include="..\..\utils\lstopo\lstopo.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libhwloc.vcxproj">
+      <Project>{9DE76C6D-4773-4766-9F93-69C56166CB8D}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>