]> git.lyx.org Git - lyx.git/blobdiff - development/cmake/modules/FindICONV.cmake
listerrors.lyx : Update a link.
[lyx.git] / development / cmake / modules / FindICONV.cmake
index 1535cf14a98a457974a7abe129767e515cfc6132..55d8fa88fdb1b403d35e776193642d3e2374481e 100644 (file)
@@ -48,16 +48,14 @@ find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
        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