Skip to content

Commit 2b3f50c

Browse files
bgoglinndenoyelle
bgoglin
authored and
ndenoyelle
committed
contrib/windows: better build directories to avoid conflicts between objects during build
Thanks to Eloi Gaudry for the patch. Signed-off-by: Brice Goglin <[email protected]>
1 parent 7d520c3 commit 2b3f50c

12 files changed

+48
-15
lines changed

‎contrib/windows/hwloc-annotate.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

‎contrib/windows/hwloc-bind.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

‎contrib/windows/hwloc-calc.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

‎contrib/windows/hwloc-diff.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

‎contrib/windows/hwloc-distrib.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

‎contrib/windows/hwloc-info.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

‎contrib/windows/hwloc-patch.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

‎contrib/windows/libhwloc.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,28 +70,28 @@
7070
<LinkIncremental>false</LinkIncremental>
7171
<EmbedManifest>true</EmbedManifest>
7272
<TargetName>$(ProjectName)-15</TargetName>
73-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
73+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
7474
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStatic|x64'">
7777
<LinkIncremental>false</LinkIncremental>
7878
<EmbedManifest>true</EmbedManifest>
7979
<TargetName>$(ProjectName)-15</TargetName>
80-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
80+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
8181
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8484
<LinkIncremental>false</LinkIncremental>
8585
<EmbedManifest>true</EmbedManifest>
8686
<TargetName>$(ProjectName)-15</TargetName>
87-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
87+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
8888
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
9191
<LinkIncremental>false</LinkIncremental>
9292
<EmbedManifest>true</EmbedManifest>
9393
<TargetName>$(ProjectName)-15</TargetName>
94-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
94+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
9595
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
9696
</PropertyGroup>
9797
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'">

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@
3030
<LinkIncremental>false</LinkIncremental>
3131
<EmbedManifest>true</EmbedManifest>
3232
<TargetName>$(ProjectName)-12</TargetName>
33-
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
33+
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
3434
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
37+
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
38+
</PropertyGroup>
3639
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3740
<ClCompile>
3841
<WarningLevel>Level3</WarningLevel>

0 commit comments

Comments
 (0)