Skip to content

Commit a5dc778

Browse files
committed
vcxproj: handle libreftable_test, too
Since ef8a6c6 (reftable: utility functions, 2021-10-07) we not only have a libreftable, but also a libreftable_test. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent fbffa2c commit a5dc778

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

contrib/buildsystems/Generators/Vcxproj.pm

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ sub createProject {
7777
my $libs_release = "\n ";
7878
my $libs_debug = "\n ";
7979
if (!$static_library && $name ne 'headless-git') {
80-
$libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib|reftable\/libreftable\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
80+
$libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib|reftable\/libreftable(_test)?\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
8181
$libs_debug = $libs_release;
8282
$libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
8383
$libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
@@ -267,6 +267,7 @@ EOM
267267
if ((!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') && !($name =~ /headless-git/)) {
268268
my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
269269
my $uuid_libreftable = $$build_structure{"LIBS_reftable/libreftable_GUID"};
270+
my $uuid_libreftable_test = $$build_structure{"LIBS_reftable/libreftable_test_GUID"};
270271
my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
271272

272273
print F << "EOM";
@@ -278,10 +279,14 @@ EOM
278279
EOM
279280
if (!($name =~ /xdiff|libreftable/)) {
280281
print F << "EOM";
281-
<ProjectReference Include="$cdup\\reftable\\libreftable\\libreftable.vcxproj">
282+
<ProjectReference Include="$cdup\\reftable\\libreftable.proj\\libreftable.vcxproj">
282283
<Project>$uuid_libreftable</Project>
283284
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
284285
</ProjectReference>
286+
<ProjectReference Include="$cdup\\reftable\\libreftable_test.proj\\libreftable_test.vcxproj">
287+
<Project>$uuid_libreftable_test</Project>
288+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
289+
</ProjectReference>
285290
EOM
286291
}
287292
if (!($name =~ 'xdiff')) {

0 commit comments

Comments
 (0)