Make iconv work like other optional libraries for MSVC.

adunstan · adunstan · commit 3a8497892c69 · 2010-03-03T03:29:37.000Z
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -3,7 +3,7 @@ package Solution;
 #
 # Package that encapsulates a Visual C++ solution file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.55 2010/03/02 22:02:31 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.56 2010/03/03 03:29:37 adunstan Exp $
 #
 use Carp;
 use strict;
@@ -413,10 +413,14 @@ sub AddProject
         $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\comerr32.lib');
         $proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\gssapi32.lib');
     }
+    if ($self->{options}->{iconv})
+    {
+        $proj->AddIncludeDir($self->{options}->{iconv} . '\include');
+        $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
+	}
     if ($self->{options}->{xml})
     {
         $proj->AddIncludeDir($self->{options}->{xml} . '\include');
-        $proj->AddIncludeDir($self->{options}->{iconv} . '\include');
         $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
     }
     if ($self->{options}->{xslt})

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.55 2010/03/02 22:02:31 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.56 2010/03/03 03:29:37 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -413,10 +413,14 @@ sub AddProject`
`413`	`413`	`$proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\comerr32.lib');`
`414`	`414`	`$proj->AddLibrary($self->{options}->{krb5} . '\lib\i386\gssapi32.lib');`
`415`	`415`	`}`
	`416`	`+ if ($self->{options}->{iconv})`
	`417`	`+ {`
	`418`	`+ $proj->AddIncludeDir($self->{options}->{iconv} . '\include');`
	`419`	`+ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');`
	`420`	`+ }`
`416`	`421`	`if ($self->{options}->{xml})`
`417`	`422`	`{`
`418`	`423`	`$proj->AddIncludeDir($self->{options}->{xml} . '\include');`
`419`		`- $proj->AddIncludeDir($self->{options}->{iconv} . '\include');`
`420`	`424`	`$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');`
`421`	`425`	`}`
`422`	`426`	`if ($self->{options}->{xslt})`