[Opensync-commits] r5543 - branches/3rd-party-cmake-modules/modules

[<svn...@op...>]

Author: bricks
Date: Mon Apr  6 11:01:23 2009
New Revision: 5543
URL: http://www.opensync.org/changeset/5543

Log:
Committed a modifed version of Henriks patch for glib and iconv with win32
refs #1097

Modified:
   branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake

Modified: branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake
==============================================================================
--- branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake	Sun Apr  5 19:55:52 2009	(r5542)
+++ branches/3rd-party-cmake-modules/modules/FindGLIB2.cmake	Mon Apr  6 11:01:23 2009	(r5543)
@@ -13,7 +13,7 @@
 #  Copyright (c) 2007 Daniel Gollub <dg...@su...>
 #  Copyright (c) 2007 Alban Browaeys <pr...@ya...>
 #  Copyright (c) 2008 Michael Bell <mic...@we...>
-#  Copyright (c) 2008 Bjoern Ricks <bjo...@go...>
+#  Copyright (c) 2008-2009 Bjoern Ricks <bjo...@go...>
 #
 #  Redistribution and use is allowed according to the terms of the New
 #  BSD license.
@@ -206,6 +206,23 @@
 
 ENDIF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS)
 
+IF ( WIN32 )
+    # include libiconv for win32
+    IF ( NOT LIBICONV_FOUND )
+      FIND_PATH(LIBICONV_INCLUDE_DIR iconv.h PATH_SUFFIXES glib-2.0)
+
+      FIND_LIBRARY(LIBICONV_LIBRARY NAMES iconv)
+
+      IF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR)
+        SET (LIBICONV_FOUND TRUE)
+      ENDIF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR)
+    ENDIF ( NOT LIBICONV_FOUND )
+    IF (LIBICONV_FOUND)
+      SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBICONV_LIBRARY})
+      SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBICONV_INCLUDE_DIR})
+    ENDIF (LIBICONV_FOUND)
+ENDIF ( WIN32 )
+
 IF ( GLIB2_FOUND )
 	# Check if system has a newer version of glib
 	# which supports g_regex_match_simple