diff options
| author | Adam <Adam@anope.org> | 2014-05-31 16:58:31 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-31 18:30:50 -0400 |
| commit | 16e0b72d2dd90bcbcfaea9bb0dc5ee9ed8cd091b (patch) | |
| tree | d684a801f53fa1a0f81e9dea1e6f40e4bb224e0b /cmake | |
| parent | b578e3253184993864d4aee2391966fcf3e26659 (diff) | |
Update FindGettext.cmake for new Windows stuff and fix language.cpp
compile
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindGettext.cmake | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index e97bfef36..975294d21 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -2,33 +2,25 @@ if(NOT WIN32) find_path(GETTEXT_INCLUDE libintl.h /usr/include /usr/local/include ${EXTRA_INCLUDE}) find_library(GETTEXT_LIBRARY intl PATHS /usr/lib /usr/lib64 ${EXTRA_LIBS}) - find_library(ICONV_LIBRARY iconv PATHS /usr/lib /usr/lib64 ${EXTRA_LIBS}) find_program(GETTEXT_MSGFMT msgfmt PATHS /usr/bin/ /usr/local/bin ${EXTRA_INCLUDE}) if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT) set(GETTEXT_FOUND TRUE) + if(GETTEXT_LIBRARY) + set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY}) + endif(GETTEXT_LIBRARY) endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT) else(NOT WIN32) find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE}) find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) - find_library(ICONV_LIBRARY libiconv PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) - find_library(MINGWEX_LIBRARY libmingwex PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) - find_library(GCC_LIBRARY libgcc PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS}) find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE}) - if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY) + if(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT) set(GETTEXT_FOUND TRUE) - endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY) + set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY}) + endif(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT) endif(NOT WIN32) # If we found everything we need set variables correctly for lang/CMakeLists.txt to use if(GETTEXT_FOUND) include_directories("${GETTEXT_INCLUDE}") set(GETTEXT_MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT}) - - if(WIN32) - set(GETTEXT_LIBRARIES libiconv libintl libmingwex libgcc) - else(WIN32) - if(GETTEXT_LIBRARY) - set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY} ${ICONV_LIBRARY}) - endif(GETTEXT_LIBRARY) - endif(WIN32) endif(GETTEXT_FOUND) |