Fix game selection in world creation (used always the first one)

[minetest.git] / cmake / Modules / FindGettextLib.cmake

diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
index 31b261539bbc6ddc4585dd6042d387ca559a63cb..5779b6b6479324f247106fb713964d9d73288d68 100644 (file)
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
@@ -41,7 +41,6 @@ IF (WIN32)
                DOC "gettext *iconv*.lib")
 ENDIF(WIN32)
 
-
 IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFMT)
        IF (WIN32)
                # in the Win32 case check also for the extra linking requirements
@@ -49,6 +48,10 @@ IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFMT)
                        SET(GETTEXT_FOUND TRUE)
                ENDIF()
        ELSE(WIN32)
+               # *BSD variants require special linkage as they don't use glibc
+               IF(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+                       SET(GETTEXT_LIBRARY "intl")
+               ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
                SET(GETTEXT_FOUND TRUE)
        ENDIF(WIN32)
 ENDIF()
@@ -56,10 +59,14 @@ ENDIF()
 IF(GETTEXT_FOUND)
        SET(GETTEXT_PO_PATH ${CMAKE_SOURCE_DIR}/po)
        SET(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES)
-       SET(GETTEXT_MO_DEST_PATH locale/<locale>/LC_MESSAGES)
+       SET(GETTEXT_MO_DEST_PATH ${DATADIR}/../locale/<locale>/LC_MESSAGES)
        FILE(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*")
+       LIST(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot)
        MACRO(SET_MO_PATHS _buildvar _destvar _locale)
                STRING(REPLACE "<locale>" ${_locale} ${_buildvar} ${GETTEXT_MO_BUILD_PATH})
                STRING(REPLACE "<locale>" ${_locale} ${_destvar} ${GETTEXT_MO_DEST_PATH})
        ENDMACRO(SET_MO_PATHS)
+ELSE()
+       SET(GETTEXT_INCLUDE_DIR "")
+       SET(GETTEXT_LIBRARY "")
 ENDIF()