diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-05-31 07:59:01 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-05-31 07:59:01 (GMT) |
| commit | 635d8cf30e702bdf83fe5c96452f8f863d57bdee (patch) | |
| tree | c88a62cfee260b2ff42ba00ce360d638605adf16 /cmake/FindIconv.cmake | |
| parent | 7bcf8e9a379ec0599160e5562f07b93f8fb9557a (diff) | |
| download | Doxygen-635d8cf30e702bdf83fe5c96452f8f863d57bdee.zip Doxygen-635d8cf30e702bdf83fe5c96452f8f863d57bdee.tar.gz Doxygen-635d8cf30e702bdf83fe5c96452f8f863d57bdee.tar.bz2 | |
Further cmake changes
- made static build option for all windows targets
- made wizard flex interactive
- add 64bit support for libiconv on windows build
- updated test mechanism
Diffstat (limited to 'cmake/FindIconv.cmake')
| -rw-r--r-- | cmake/FindIconv.cmake | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake index 5ef8686..d96e3c0 100644 --- a/cmake/FindIconv.cmake +++ b/cmake/FindIconv.cmake @@ -45,14 +45,25 @@ if(NOT ICONV_INCLUDE_DIR STREQUAL "ICONV_INCLUDE_DIR-NOTFOUND") endif() if(NOT ICONV_IN_GLIBC) - find_library(ICONV_LIBRARY - NAMES iconv - HINTS - ${CMAKE_PREFIX_PATH} - ${ICONV_DIR} - $ENV{ICONV_DIR} - PATH_SUFFIXES lib64 lib - ) + if (CMAKE_CL_64) + find_library(ICONV_LIBRARY + NAMES iconv64 + HINTS + ${CMAKE_PREFIX_PATH} + ${ICONV_DIR} + $ENV{ICONV_DIR} + PATH_SUFFIXES lib64 lib + ) + else() + find_library(ICONV_LIBRARY + NAMES iconv + HINTS + ${CMAKE_PREFIX_PATH} + ${ICONV_DIR} + $ENV{ICONV_DIR} + PATH_SUFFIXES lib64 lib + ) + endif() set(ICONV_TEST ${ICONV_LIBRARY}) else() set(ICONV_TEST "In glibc") |