Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / development / cmake / modules / FindICONV.cmake

diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake
index 194a45ed6c73de2a00f413163e7ea9e40ef46551..55d8fa88fdb1b403d35e776193642d3e2374481e 100644 (file)
--- a/development/cmake/modules/FindICONV.cmake
+++ b/development/cmake/modules/FindICONV.cmake
@@ -32,21 +32,30 @@ if (ICONV_INCLUDE_DIR)
   set(ICONV_FIND_QUIETLY TRUE)
 endif()
 
-find_path(ICONV_INCLUDE_DIR iconv.h
+find_path(ICONV_INCLUDE_DIR iconv.h PATHS
  /usr/include
  /usr/local/include)
+       
+find_file(ICONV_HEADER iconv.h
+       PATHS ${ICONV_INCLUDE_DIR} NO_DEFAULT_PATH)
 
 set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
 
+
+find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
+       PATHS
+       ${ICONV_RELATIVE_TO_LIBINTL}
+       NO_DEFAULT_PATH)
+       
 find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
-       PATHS /usr/lib /usr/local/lib)
+       PATHS ${SYSTEM_LIB_DIRS} )
 
 if(WIN32)
        set(ICONV_DLL_NAMES iconv.dll  libiconv.dll libiconv2.dll)
        find_file(ICONV_DLL   
                                        NAMES ${ICONV_DLL_NAMES}
                                        PATHS ENV PATH
-                                       NO_DEFAULT_PATH)
+                                       ${ICONV_INCLUDE_DIR}/../bin)
        find_file(ICONV_DLL_HELP   
                                        NAMES ${ICONV_DLL_NAMES}
                                        PATHS ENV PATH
@@ -69,6 +78,7 @@ if(WIN32)
                set(ICONV_FOUND TRUE)
        endif()
 else()
+       include(CheckFunctionExists)
        check_function_exists(iconv HAVE_ICONV_IN_LIBC)
        if(ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
                set(ICONV_FOUND TRUE)
@@ -96,4 +106,4 @@ else()
    endif()
 endif()
 
-mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR)
+mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR ICONV_DLL ICONV_DLL_HELP)