cmake: more logs for intl support

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

diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake
index b312a09235cd006ff7731b1b860545df8ba292ab..1535cf14a98a457974a7abe129767e515cfc6132 100644 (file)
--- a/development/cmake/modules/FindICONV.cmake
+++ b/development/cmake/modules/FindICONV.cmake
@@ -32,14 +32,25 @@ 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
+       /usr/lib 
+       /usr/local/lib)
 
 if(WIN32)
        set(ICONV_DLL_NAMES iconv.dll  libiconv.dll libiconv2.dll)
@@ -69,6 +80,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)