File tree Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Original file line number Diff line number Diff line change @@ -313,11 +313,8 @@ sub WriteItemDefinitionGroup
313
313
my $targetmachine =
314
314
$self -> {platform } eq ' Win32' ? ' MachineX86' : ' MachineX64' ;
315
315
316
- my $includes = $self -> {includes };
317
- unless ($includes eq ' ' or $includes =~ / ;$ / )
318
- {
319
- $includes .= ' ;' ;
320
- }
316
+ my $includes = join ' ;' , @{$self -> {includes }}, " " ;
317
+
321
318
print $f <<EOF ;
322
319
<ItemDefinitionGroup Condition="'\$ (Configuration)|\$ (Platform)'=='$cfgname |$self ->{platform}'">
323
320
<ClCompile>
Original file line number Diff line number Diff line change @@ -937,7 +937,7 @@ sub AddTransformModule
937
937
# Add PL dependencies
938
938
$p -> AddIncludeDir($pl_src );
939
939
$p -> AddReference($pl_proj );
940
- $p -> AddIncludeDir($pl_proj -> {includes }) ;
940
+ $p -> AddIncludeDir($_ ) for @{ $ pl_proj-> {includes }} ;
941
941
foreach my $pl_lib (@{ $pl_proj -> {libraries } })
942
942
{
943
943
$p -> AddLibrary($pl_lib );
@@ -947,7 +947,7 @@ sub AddTransformModule
947
947
if ($type_proj )
948
948
{
949
949
$p -> AddIncludeDir($type_src );
950
- $p -> AddIncludeDir($type_proj -> {includes }) ;
950
+ $p -> AddIncludeDir($_ ) for @{ $ type_proj-> {includes }} ;
951
951
foreach my $type_lib (@{ $type_proj -> {libraries } })
952
952
{
953
953
$p -> AddLibrary($type_lib );
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ sub _new
30
30
references => [],
31
31
libraries => [],
32
32
suffixlib => [],
33
- includes => ' ' ,
33
+ includes => [] ,
34
34
prefixincludes => ' ' ,
35
35
defines => ' ;' ,
36
36
solution => $solution ,
@@ -151,13 +151,15 @@ sub AddLibrary
151
151
152
152
sub AddIncludeDir
153
153
{
154
- my ($self , $inc ) = @_ ;
154
+ my ($self , $incstr ) = @_ ;
155
155
156
- if ( $self -> { includes } ne ' ' )
156
+ foreach my $inc ( split ( / ; / , $incstr ) )
157
157
{
158
- $self -> {includes } .= ' ;' ;
158
+ if (! grep { $_ eq $inc } @{ $self -> {includes } })
159
+ {
160
+ push @{ $self -> {includes } }, $inc ;
161
+ }
159
162
}
160
- $self -> {includes } .= $inc ;
161
163
return ;
162
164
}
163
165
You can’t perform that action at this time.
0 commit comments