diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-07-18 12:11:08 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-07-18 12:11:08 +0000 |
| commit | 86e10880c98d4e11f8eb055116fdd3abb3fef430 (patch) | |
| tree | cb10fea14dc59c479137761d8ae6406646dd72cb /cmake | |
| parent | 2e7890098224bb96db5d8f1b99e3fb427cf3f58b (diff) | |
| download | wireshark-86e10880c98d4e11f8eb055116fdd3abb3fef430.tar.gz wireshark-86e10880c98d4e11f8eb055116fdd3abb3fef430.tar.bz2 wireshark-86e10880c98d4e11f8eb055116fdd3abb3fef430.zip | |
Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.
svn path=/trunk/; revision=25765
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGLIB2.cmake | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index 19d4f8e87f..9869861e78 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -168,34 +168,6 @@ else (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS) endif (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR) ## - ## libiconv - find_path(LIBICONV_INCLUDE_DIR - NAMES - iconv.h - PATHS - /opt/gnome/include/glib-2.0 - /usr/include/glib-2.0 - /usr/local/include/glib-2.0 - /opt/local/include/glib-2.0 - /sw/include/glib-2.0 - ) - - find_library(LIBICONV_LIBRARY - NAMES - iconv - PATHS - /opt/gnome/lib - /usr/lib - /usr/local/lib - /opt/local/lib - /sw/lib - ) - - if (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR) - set(LIBICONV_FOUND TRUE) - endif (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR) - ## - set(GLIB2_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} @@ -219,11 +191,6 @@ else (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS) set(GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR}) endif (LIBINTL_FOUND) - if (LIBICONV_FOUND) - set(GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBICONV_LIBRARY}) - set(GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBICONV_INCLUDE_DIR}) - endif (LIBICONV_FOUND) - if (GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) set(GLIB2_FOUND TRUE) endif (GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) |