anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

search also for other names of iconv.dll

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14880 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2006-09-03 13:46:47 +00:00
parent bae41d8a3b
commit cf3ec5d31f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
development/cmake/modules/FindICONV.cmake
View File

@ -9,7 +9,7 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h
/usr/local/include
)
set(POTENTIAL_ICONV_LIBS iconv libiconv)
set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
FIND_LIBRARY(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
PATHS
/usr/lib
@ -17,8 +17,12 @@ PATHS
)
if(WIN32)
FIND_FILE(ICONV_DLL iconv.dll NO_DEFAULT_PATH ENV PATH)
FIND_FILE(ICONV_DLL_HELP iconv.dll)
set(ICONV_DLL_NAMES iconv.dll libiconv.dll libiconv2.dll)
FIND_FILE(ICONV_DLL
NAMES ${ICONV_DLL_NAMES}
PATHS ENV PATH
NO_DEFAULT_PATH)
FIND_FILE(ICONV_DLL_HELP NAMES libiconv2.dll)
IF(ICONV_FIND_REQUIRED)
IF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP)
MESSAGE(FATAL_ERROR "Could not find iconv.dll, please add correct your PATH environment variable")
@ -41,7 +45,8 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
IF (ICONV_FOUND)
IF (NOT ICONV_FIND_QUIETLY)
MESSAGE(STATUS "Found iconv: ${ICONV_LIBRARY}")
MESSAGE(STATUS "Found iconv library: ${ICONV_LIBRARY}")
#MESSAGE(STATUS "Found iconv dll : ${ICONV_DLL}")
ENDIF (NOT ICONV_FIND_QUIETLY)
ELSE (ICONV_FOUND)
IF (ICONV_FIND_REQUIRED)