contrib/windows: fix and reorder the list of source files an headers

Mostly for consistency. Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr> (cherry picked from commit a514ca2)
open-mpi · Feb 7, 2020 · 0e1069a · 0e1069a
1 parent 03d4260
commit 0e1069a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/contrib/windows/libhwloc.vcxproj b/contrib/windows/libhwloc.vcxproj
@@ -200,11 +200,11 @@
     <ClCompile Include="..\..\hwloc\bind.c" />
     <ClCompile Include="..\..\hwloc\bitmap.c" />
     <ClCompile Include="..\..\hwloc\components.c" />
-    <ClCompile Include="..\..\hwloc\distances.c" />
     <ClCompile Include="..\..\hwloc\diff.c" />
-    <ClCompile Include="..\..\hwloc\shmem.c" />
+    <ClCompile Include="..\..\hwloc\distances.c" />
     <ClCompile Include="..\..\hwloc\misc.c" />
     <ClCompile Include="..\..\hwloc\pci-common.c" />
+    <ClCompile Include="..\..\hwloc\shmem.c" />
     <ClCompile Include="..\..\hwloc\topology-noos.c" />
     <ClCompile Include="..\..\hwloc\topology-synthetic.c" />
     <ClCompile Include="..\..\hwloc\topology-windows.c" />
@@ -220,10 +220,13 @@
     <ClInclude Include="..\..\include\private\autogen\config.h" />
     <ClInclude Include="..\..\include\hwloc.h" />
     <ClInclude Include="..\..\include\hwloc\bitmap.h" />
+    <ClInclude Include="..\..\include\hwloc\deprecated.h" />
+    <ClInclude Include="..\..\include\hwloc\diff.h" />
+    <ClInclude Include="..\..\include\hwloc\distances.h" />
+    <ClInclude Include="..\..\include\hwloc\export.h" />
     <ClInclude Include="..\..\include\hwloc\helper.h" />
-    <ClInclude Include="..\..\include\hwloc\openfabrics-verbs.h" />
+    <ClInclude Include="..\..\include\hwloc\inlines.h" />
     <ClInclude Include="..\..\include\hwloc\plugins.h" />
-    <ClInclude Include="..\..\include\hwloc\diff.h" />
     <ClInclude Include="..\..\include\hwloc\shmem.h" />
     <ClInclude Include="..\..\include\hwloc\rename.h" />
     <ClInclude Include="..\..\include\private\components.h" />

diff --git a/contrib/windows/libhwloc.vcxproj.filters b/contrib/windows/libhwloc.vcxproj.filters
@@ -27,10 +27,10 @@
     <ClCompile Include="..\..\hwloc\components.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\hwloc\distances.c">
+    <ClCompile Include="..\..\hwloc\diff.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\hwloc\diff.c">
+    <ClCompile Include="..\..\hwloc\distances.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\hwloc\misc.c">
@@ -68,22 +68,40 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\include\hwloc\autogen\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\private\autogen\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\hwloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\hwloc\bitmap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\hwloc\deprecated.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\hwloc\diff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\hwloc\distances.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\hwloc\export.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\hwloc\helper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\hwloc\openfabrics-verbs.h">
+    <ClInclude Include="..\..\include\hwloc\inlines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\hwloc\plugins.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\hwloc\diff.h">
+    <ClInclude Include="..\..\include\hwloc\shmem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\hwloc\rename.h">
@@ -107,11 +125,5 @@
     <ClInclude Include="..\..\include\private\xml.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\private\autogen\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\hwloc\autogen\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>