From ad2f95fc700f1625bf1ac30e5de3ff8b8b7180ba Mon Sep 17 00:00:00 2001
From: Constantin Wenger <constantin.wenger@googlemail.com>
Date: Thu, 21 Jul 2011 13:24:37 +0200
Subject: [PATCH] updated some path because the dlls are mostly under bin not
lib added explanation why libintl must not belinked under some oses
---
cmake/Modules/FindGettextLib.cmake | 5 +++--
1 file 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)
--
GitLab