Add MSVC build system support for ICU

Author: Ashutosh Sharma <[email protected]>
Reviewed-by: Michael Paquier <[email protected]>

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 968bb33157e53a6400a00ac2b7d9210661c9538d..8bc6a18eeeb11c313fa6339df27451402f8d38ef 100644 (file)
--- 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 93f788707506bce82a19183920234b78a260e76e..4d69dc2a2e4836a619276851d9ad3e2268996e5b 100644 (file)
--- 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>