diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-06-12 11:05:20 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-06-12 11:05:20 -0400 |
| commit | 03c396080ddc77b188a11dd54aa2a075ab2718e0 (patch) | |
| tree | d6b13d4fbc88f8cda63092e18c7788645f0c3f73 /src | |
| parent | 253504fb9f804b6aa7cec9b9b2506fa88accf0dc (diff) | |
| download | postgresql-03c396080ddc77b188a11dd54aa2a075ab2718e0.tar.gz postgresql-03c396080ddc77b188a11dd54aa2a075ab2718e0.zip | |
Add MSVC build system support for ICU
Author: Ashutosh Sharma <ashu.coek88@gmail.com>
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Solution.pm | 12 | ||||
| -rw-r--r-- | src/tools/msvc/config_default.pl | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 968bb33157e..8bc6a18eeeb 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -220,6 +220,10 @@ s{PG_VERSION_STR "[^"]+"}{PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, c { print $o "#define ENABLE_GSS 1\n"; } + if ($self->{options}->{icu}) + { + print $o "#define USE_ICU 1\n"; + } if (my $port = $self->{options}->{"--with-pgport"}) { print $o "#undef DEF_PGPORT\n"; @@ -555,6 +559,13 @@ sub AddProject $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); } + if ($self->{options}->{icu}) + { + $proj->AddIncludeDir($self->{options}->{icu} . '\include'); + $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); + $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); + $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); + } if ($self->{options}->{xml}) { $proj->AddIncludeDir($self->{options}->{xml} . '\include'); @@ -677,6 +688,7 @@ sub GetFakeConfigure $cfg .= ' --with-libxml' if ($self->{options}->{xml}); $cfg .= ' --with-libxslt' if ($self->{options}->{xslt}); $cfg .= ' --with-gssapi' if ($self->{options}->{gss}); + $cfg .= ' --with-icu' if ($self->{options}->{icu}); $cfg .= ' --with-tcl' if ($self->{options}->{tcl}); $cfg .= ' --with-perl' if ($self->{options}->{perl}); $cfg .= ' --with-python' if ($self->{options}->{python}); diff --git a/src/tools/msvc/config_default.pl b/src/tools/msvc/config_default.pl index 93f78870750..4d69dc2a2e4 100644 --- a/src/tools/msvc/config_default.pl +++ b/src/tools/msvc/config_default.pl @@ -15,6 +15,7 @@ our $config = { ldap => 1, # --with-ldap extraver => undef, # --with-extra-version=<string> gss => undef, # --with-gssapi=<path> + icu => undef, # --with-icu=<path> nls => undef, # --enable-nls=<path> tap_tests => undef, # --enable-tap-tests tcl => undef, # --with-tls=<path> |