diff options
| author | Constantin Wenger <constantin.wenger@googlemail.com> | 2011-07-21 13:24:37 +0200 |
|---|---|---|
| committer | Constantin Wenger <constantin.wenger@googlemail.com> | 2011-07-21 13:24:37 +0200 |
| commit | 2a6c0fc17f0ed113a6f46f852338b96bce4d966d (patch) | |
| tree | 37462499d8723d668ff74fe2d44b756c79137732 /cmake/Modules | |
| parent | 1340da7b54721cffff6c546df2f4e2c931cf6377 (diff) | |
| download | minetest-2a6c0fc17f0ed113a6f46f852338b96bce4d966d.tar.gz minetest-2a6c0fc17f0ed113a6f46f852338b96bce4d966d.tar.bz2 minetest-2a6c0fc17f0ed113a6f46f852338b96bce4d966d.zip | |
updated some path because the dlls are mostly under bin not lib
added explanation why libintl must not belinked under some oses
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/FindGettextLib.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake index 1ef8997f4..3fb391e65 100644 --- a/cmake/Modules/FindGettextLib.cmake +++ b/cmake/Modules/FindGettextLib.cmake @@ -17,6 +17,7 @@ FIND_PROGRAM(GETTEXT_MSGFMT DOC "path to msgfmt") # modern Linux, as well as Mac, seem to not need require special linking +# they do not because gettext is part of glibc # TODO check the requirements on other BSDs and older Linux IF (WIN32) FIND_LIBRARY(GETTEXT_LIBRARY @@ -25,11 +26,11 @@ IF (WIN32) DOC "gettext *intl*.lib") FIND_LIBRARY(GETTEXT_DLL NAMES libintl.dll intl.dll libintl3.dll intl3.dll - PATHS "${CUSTOM_GETTEXT_PATH}/lib" + PATHS "${CUSTOM_GETTEXT_PATH}/bin" "${CUSTOM_GETTEXT_PATH}/lib" DOC "gettext *intl*.dll") FIND_LIBRARY(GETTEXT_ICONV_DLL NAMES libiconv2.dll - PATHS "${CUSTOM_GETTEXT_PATH}/lib" + PATHS "${CUSTOM_GETTEXT_PATH}/bin" "${CUSTOM_GETTEXT_PATH}/lib" DOC "gettext *iconv*.lib") ENDIF(WIN32) |