Skip to content

Commit 673a17e

Browse files
committed
Add missing include dir and references to libpq for MSVC build
66d6086 adjusted pg_regress to require this but forgot to adjust the Visual Studio build script.
1 parent cccfa08 commit 673a17e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/tools/msvc/Mkvcbuild.pm

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,11 @@ sub mkvcbuild
356356
$pgregress_ecpg->AddFile('src/test/regress/pg_regress.c');
357357
$pgregress_ecpg->AddIncludeDir('src/port');
358358
$pgregress_ecpg->AddIncludeDir('src/test/regress');
359+
$pgregress_ecpg->AddIncludeDir('src/interfaces/libpq');
359360
$pgregress_ecpg->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
360361
$pgregress_ecpg->AddLibrary('ws2_32.lib');
361362
$pgregress_ecpg->AddDirResourceFile('src/interfaces/ecpg/test');
362-
$pgregress_ecpg->AddReference($libpgcommon, $libpgport);
363+
$pgregress_ecpg->AddReference($libpq, $libpgcommon, $libpgport);
363364

364365
my $isolation_tester =
365366
$solution->AddProject('isolationtester', 'exe', 'misc');
@@ -383,10 +384,11 @@ sub mkvcbuild
383384
$pgregress_isolation->AddFile('src/test/regress/pg_regress.c');
384385
$pgregress_isolation->AddIncludeDir('src/port');
385386
$pgregress_isolation->AddIncludeDir('src/test/regress');
387+
$pgregress_isolation->AddIncludeDir('src/interfaces/libpq');
386388
$pgregress_isolation->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
387389
$pgregress_isolation->AddLibrary('ws2_32.lib');
388390
$pgregress_isolation->AddDirResourceFile('src/test/isolation');
389-
$pgregress_isolation->AddReference($libpgcommon, $libpgport);
391+
$pgregress_isolation->AddReference($libpq, $libpgcommon, $libpgport);
390392

391393
# src/bin
392394
my $D;
@@ -854,10 +856,11 @@ sub mkvcbuild
854856
$pgregress->AddFile('src/test/regress/pg_regress.c');
855857
$pgregress->AddFile('src/test/regress/pg_regress_main.c');
856858
$pgregress->AddIncludeDir('src/port');
859+
$pgregress->AddIncludeDir('src/interfaces/libpq');
857860
$pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
858861
$pgregress->AddLibrary('ws2_32.lib');
859862
$pgregress->AddDirResourceFile('src/test/regress');
860-
$pgregress->AddReference($libpgcommon, $libpgport);
863+
$pgregress->AddReference($libpq, $libpgcommon, $libpgport);
861864

862865
# fix up pg_waldump once it's been set up
863866
# files symlinked on Unix are copied on windows

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy