mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-06 00:10:59 +00:00
check PATH for iconv.dll
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14901 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0f40c394ce
commit
3a4c53e206
@ -22,16 +22,22 @@ if(WIN32)
|
||||
NAMES ${ICONV_DLL_NAMES}
|
||||
PATHS ENV PATH
|
||||
NO_DEFAULT_PATH)
|
||||
FIND_FILE(ICONV_DLL_HELP NAMES libiconv2.dll)
|
||||
FIND_FILE(ICONV_DLL_HELP
|
||||
NAMES ${ICONV_DLL_NAMES}
|
||||
PATHS ENV PATH
|
||||
${ICONV_INCLUDE_DIR}/../bin)
|
||||
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")
|
||||
ENDIF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP)
|
||||
IF(NOT ICONV_DLL AND ICONV_DLL_HELP)
|
||||
GET_FILENAME_COMPONENT(ICONV_DLL_HELP ${ICONV_DLL_HELP} PATH)
|
||||
MESSAGE("\nCould not find iconv.dll in standard search path, please add ")
|
||||
MESSAGE("${ICONV_DLL_HELP} to your PATH environment variable.\n")
|
||||
MESSAGE(FATAL_ERROR)
|
||||
MESSAGE(STATUS)
|
||||
MESSAGE(STATUS "Could not find iconv.dll in standard search path, please add ")
|
||||
MESSAGE(STATUS "${ICONV_DLL_HELP}")
|
||||
MESSAGE(STATUS "to your PATH environment variable.")
|
||||
MESSAGE(STATUS)
|
||||
MESSAGE(FATAL_ERROR "exit cmake")
|
||||
ENDIF(NOT ICONV_DLL AND ICONV_DLL_HELP)
|
||||
ENDIF(ICONV_FIND_REQUIRED)
|
||||
ELSE(WIN32)
|
||||
@ -52,8 +58,8 @@ ELSE (ICONV_FOUND)
|
||||
IF (ICONV_FIND_REQUIRED)
|
||||
MESSAGE(STATUS "Looked for iconv library named ${POTENTIAL_ICONV_LIBS}.")
|
||||
MESSAGE(STATUS "Found no acceptable iconv library. This is fatal.")
|
||||
message("iconv header: ${ICONV_INCLUDE_DIR}")
|
||||
message("iconv lib : ${ICONV_LIBRARY}")
|
||||
MESSAGE(STATUS "iconv header: ${ICONV_INCLUDE_DIR}")
|
||||
MESSAGE(STATUS "iconv lib : ${ICONV_LIBRARY}")
|
||||
MESSAGE(FATAL_ERROR "Could NOT find iconv library")
|
||||
ENDIF (ICONV_FIND_REQUIRED)
|
||||
ENDIF (ICONV_FOUND)
|
||||
|
Loading…
Reference in New Issue
Block a user