Player data to Database (#5475)
[oweals/minetest.git] / src / CMakeLists.txt
index 88ab995ba60a8349b0cc9f228bd6298e92491caa..7f779db10fe85ae6edc731a903ba151f298f3a77 100644 (file)
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 
-project(Minetest)
-string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+project(minetest)
 
 INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckLibraryExists)
 
 # Add custom SemiDebug build mode
 set(CMAKE_CXX_FLAGS_SEMIDEBUG "-O1 -g -Wall -Wabi" CACHE STRING
@@ -28,6 +28,12 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
 
 
+if(NOT (BUILD_CLIENT OR BUILD_SERVER))
+       message(WARNING "Neither BUILD_CLIENT nor BUILD_SERVER is set! Setting BUILD_SERVER=true")
+       set(BUILD_SERVER TRUE)
+endif()
+
+
 option(ENABLE_CURL "Enable cURL support for fetching media" TRUE)
 set(USE_CURL FALSE)
 
@@ -41,6 +47,15 @@ else()
        mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
 endif()
 
+if(NOT USE_CURL)
+       if(BUILD_CLIENT)
+               message(WARNING "cURL is required to load the server list")
+       endif()
+       if(BUILD_SERVER)
+               message(WARNING "cURL is required to announce to the server list")
+       endif()
+endif()
+
 
 option(ENABLE_GETTEXT "Use GetText for internationalization" FALSE)
 set(USE_GETTEXT FALSE)
@@ -141,9 +156,49 @@ if(ENABLE_FREETYPE)
        endif()
 endif(ENABLE_FREETYPE)
 
+option(ENABLE_CURSES "Enable ncurses console" TRUE)
+set(USE_CURSES FALSE)
 
-find_package(Lua REQUIRED)
-
+if(ENABLE_CURSES)
+       find_package(Ncursesw)
+       if(CURSES_FOUND)
+               set(USE_CURSES TRUE)
+               message(STATUS "ncurses console enabled.")
+               include_directories(${CURSES_INCLUDE_DIRS})
+       else()
+               message(STATUS "ncurses not found!")
+       endif()
+endif(ENABLE_CURSES)
+
+option(ENABLE_POSTGRESQL "Enable PostgreSQL backend" TRUE)
+set(USE_POSTGRESQL FALSE)
+
+if(ENABLE_POSTGRESQL)
+       find_program(POSTGRESQL_CONFIG_EXECUTABLE pg_config DOC "pg_config")
+       find_library(POSTGRESQL_LIBRARY pq)
+       if(POSTGRESQL_CONFIG_EXECUTABLE)
+               execute_process(COMMAND ${POSTGRESQL_CONFIG_EXECUTABLE} --includedir-server
+                       OUTPUT_VARIABLE POSTGRESQL_SERVER_INCLUDE_DIRS
+                       OUTPUT_STRIP_TRAILING_WHITESPACE)
+               execute_process(COMMAND ${POSTGRESQL_CONFIG_EXECUTABLE}
+                       OUTPUT_VARIABLE POSTGRESQL_CLIENT_INCLUDE_DIRS
+                       OUTPUT_STRIP_TRAILING_WHITESPACE)
+               # This variable is case sensitive for the cmake PostgreSQL module
+               set(PostgreSQL_ADDITIONAL_SEARCH_PATHS ${POSTGRESQL_SERVER_INCLUDE_DIRS} ${POSTGRESQL_CLIENT_INCLUDE_DIRS})
+       endif()
+
+       find_package("PostgreSQL")
+
+       if(POSTGRESQL_FOUND)
+               set(USE_POSTGRESQL TRUE)
+               message(STATUS "PostgreSQL backend enabled")
+               # This variable is case sensitive, don't try to change it to POSTGRESQL_INCLUDE_DIR
+               message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIR}")
+               include_directories(${PostgreSQL_INCLUDE_DIR})
+       else()
+               message(STATUS "PostgreSQL not found!")
+       endif()
+endif(ENABLE_POSTGRESQL)
 
 option(ENABLE_LEVELDB "Enable LevelDB backend" TRUE)
 set(USE_LEVELDB FALSE)
@@ -178,7 +233,21 @@ endif(ENABLE_REDIS)
 
 
 find_package(SQLite3 REQUIRED)
-find_package(Json REQUIRED)
+
+OPTION(ENABLE_SPATIAL "Enable SpatialIndex AreaStore backend" TRUE)
+set(USE_SPATIAL FALSE)
+
+if(ENABLE_SPATIAL)
+       find_library(SPATIAL_LIBRARY spatialindex)
+       find_path(SPATIAL_INCLUDE_DIR spatialindex/SpatialIndex.h)
+       if(SPATIAL_LIBRARY AND SPATIAL_INCLUDE_DIR)
+               set(USE_SPATIAL TRUE)
+               message(STATUS "SpatialIndex AreaStore backend enabled.")
+               include_directories(${SPATIAL_INCLUDE_DIR})
+       else(SPATIAL_LIBRARY AND SPATIAL_INCLUDE_DIR)
+               message(STATUS "SpatialIndex not found!")
+       endif(SPATIAL_LIBRARY AND SPATIAL_INCLUDE_DIR)
+endif(ENABLE_SPATIAL)
 
 
 if(NOT MSVC)
@@ -194,16 +263,21 @@ if(WIN32)
                set(PLATFORM_LIBS dbghelp.lib ${PLATFORM_LIBS})
                # Surpress some useless warnings
                add_definitions ( /D "_CRT_SECURE_NO_DEPRECATE" /W1 )
+               # Get M_PI to work
+               add_definitions(/D "_USE_MATH_DEFINES")
        else() # Probably MinGW = GCC
-               set(PLATFORM_LIBS ws2_32.lib)
+               set(PLATFORM_LIBS "")
        endif()
+       set(PLATFORM_LIBS ws2_32.lib shlwapi.lib ${PLATFORM_LIBS})
+
        # Zlib stuff
        set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
                        CACHE PATH "Zlib include directory")
        set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.lib"
-                       CACHE FILEPATH "Path to zlibwapi.lib")
+                       CACHE FILEPATH "Path to zlib library (usually zlibwapi.lib)")
        set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
-                       CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
+                       CACHE FILEPATH "Path to zlib DLL (for installation)")
+       set(ZLIBWAPI_DLL "" CACHE FILEPATH "Path to zlibwapi DLL")
        set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
                        CACHE PATH "irrlicht dir")
        if(USE_FREETYPE)
@@ -245,13 +319,23 @@ else()
        if(APPLE)
                set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
        else()
-               set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+               check_library_exists(rt clock_gettime "" HAVE_LIBRT)
+               if (HAVE_LIBRT)
+                       set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+               endif(HAVE_LIBRT)
        endif(APPLE)
-       #set(CLIENT_PLATFORM_LIBS -lXxf86vm)
+
        # This way Xxf86vm is found on OpenBSD too
        find_library(XXF86VM_LIBRARY Xxf86vm)
        mark_as_advanced(XXF86VM_LIBRARY)
        set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
+
+       # Prefer local iconv if installed
+       find_library(ICONV_LIBRARY iconv)
+       mark_as_advanced(ICONV_LIBRARY)
+       if (ICONV_LIBRARY)
+               set(PLATFORM_LIBS ${PLATFORM_LIBS} ${ICONV_LIBRARY})
+       endif()
 endif()
 
 check_include_files(endian.h HAVE_ENDIAN_H)
@@ -268,24 +352,22 @@ add_custom_target(GenerateVersion
        -D "GENERATE_VERSION_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
        -D "GENERATE_VERSION_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}"
        -D "VERSION_STRING=${VERSION_STRING}"
-       -D "VERSION_EXTRA=${VERSION_EXTRA}"
+       -D "DEVELOPMENT_BUILD=${DEVELOPMENT_BUILD}"
        -P "${CMAKE_SOURCE_DIR}/cmake/Modules/GenerateVersion.cmake"
        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 
 
-add_subdirectory(jthread)
+add_subdirectory(threading)
 add_subdirectory(network)
 add_subdirectory(script)
+add_subdirectory(unittest)
 add_subdirectory(util)
-
-
-set (unittests_SRCS
-       test.cpp
-)
+add_subdirectory(irrlicht_changes)
 
 set(common_SRCS
        ban.cpp
        cavegen.cpp
+       chat.cpp
        clientiface.cpp
        collision.cpp
        content_abm.cpp
@@ -295,7 +377,9 @@ set(common_SRCS
        convert_json.cpp
        craftdef.cpp
        database-dummy.cpp
+       database-files.cpp
        database-leveldb.cpp
+       database-postgresql.cpp
        database-redis.cpp
        database-sqlite3.cpp
        database.cpp
@@ -311,17 +395,23 @@ set(common_SRCS
        inventory.cpp
        inventorymanager.cpp
        itemdef.cpp
+       itemstackmetadata.cpp
        light.cpp
        log.cpp
        map.cpp
+       map_settings_manager.cpp
        mapblock.cpp
        mapgen.cpp
+       mapgen_flat.cpp
+       mapgen_fractal.cpp
        mapgen_singlenode.cpp
        mapgen_v5.cpp
        mapgen_v6.cpp
        mapgen_v7.cpp
+       mapgen_valleys.cpp
        mapnode.cpp
        mapsector.cpp
+       metadata.cpp
        mg_biome.cpp
        mg_decoration.cpp
        mg_ore.cpp
@@ -332,16 +422,21 @@ set(common_SRCS
        nodemetadata.cpp
        nodetimer.cpp
        noise.cpp
+       objdef.cpp
        object_properties.cpp
        pathfinder.cpp
        player.cpp
        porting.cpp
        profiler.cpp
        quicktune.cpp
+       reflowscan.cpp
+       remoteplayer.cpp
+       raycast.cpp
        rollback.cpp
        rollback_interface.cpp
        serialization.cpp
        server.cpp
+       serverenvironment.cpp
        serverlist.cpp
        serverobject.cpp
        settings.cpp
@@ -349,6 +444,8 @@ set(common_SRCS
        sound.cpp
        staticobject.cpp
        subgame.cpp
+       terminal_chat_console.cpp
+       tileanimation.cpp
        tool.cpp
        treegen.cpp
        version.cpp
@@ -358,13 +455,14 @@ set(common_SRCS
        ${JTHREAD_SRCS}
        ${common_SCRIPT_SRCS}
        ${UTIL_SRCS}
-       ${unittests_SRCS}
+       ${UNITTEST_SRCS}
 )
 
 
 # This gives us the icon and file version information
 if(WIN32)
        set(WINRESOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc")
+       set(MINETEST_EXE_MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/minetest.exe.manifest")
        if(MINGW)
                if(NOT CMAKE_RC_COMPILER)
                        set(CMAKE_RC_COMPILER "windres.exe")
@@ -377,7 +475,7 @@ if(WIN32)
                        DEPENDS ${WINRESOURCE_FILE})
                SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
        else(MINGW) # Probably MSVC
-               set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE})
+               set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})
        endif(MINGW)
 endif()
 
@@ -392,9 +490,10 @@ set(client_SRCS
        ${common_SRCS}
        ${sound_SRCS}
        ${client_network_SRCS}
+       ${client_irrlicht_changes_SRCS}
        camera.cpp
-       chat.cpp
        client.cpp
+       clientenvironment.cpp
        clientmap.cpp
        clientmedia.cpp
        clientobject.cpp
@@ -418,16 +517,20 @@ set(client_SRCS
        guiVolumeChange.cpp
        hud.cpp
        imagefilters.cpp
+       intlGUIEditBox.cpp
        keycode.cpp
        localplayer.cpp
        main.cpp
        mapblock_mesh.cpp
        mesh.cpp
+       mesh_generator_thread.cpp
+       minimap.cpp
        particles.cpp
        shader.cpp
        sky.cpp
        wieldmesh.cpp
        ${client_SCRIPT_SRCS}
+       ${UNITTEST_CLIENT_SRCS}
 )
 list(SORT client_SRCS)
 
@@ -449,7 +552,9 @@ include_directories(
        ${SOUND_INCLUDE_DIRS}
        ${SQLITE3_INCLUDE_DIR}
        ${LUA_INCLUDE_DIR}
+       ${GMP_INCLUDE_DIR}
        ${JSON_INCLUDE_DIR}
+       ${X11_INCLUDE_DIR}
        ${PROJECT_SOURCE_DIR}/script
 )
 
@@ -467,10 +572,10 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 
 if(BUILD_CLIENT)
-       add_executable(${PROJECT_NAME_LOWER} ${client_SRCS})
-       add_dependencies(${PROJECT_NAME_LOWER} GenerateVersion)
+       add_executable(${PROJECT_NAME} ${client_SRCS})
+       add_dependencies(${PROJECT_NAME} GenerateVersion)
        set(client_LIBS
-               ${PROJECT_NAME_LOWER}
+               ${PROJECT_NAME}
                ${ZLIB_LIBRARIES}
                ${IRRLICHT_LIBRARY}
                ${OPENGL_LIBRARIES}
@@ -482,6 +587,7 @@ if(BUILD_CLIENT)
                ${SOUND_LIBRARIES}
                ${SQLITE3_LIBRARY}
                ${LUA_LIBRARY}
+               ${GMP_LIBRARY}
                ${JSON_LIBRARY}
                ${OPENGLES2_LIBRARIES}
                ${PLATFORM_LIBS}
@@ -499,60 +605,101 @@ if(BUILD_CLIENT)
        endif()
        if(USE_CURL)
                target_link_libraries(
-                       ${PROJECT_NAME_LOWER}
+                       ${PROJECT_NAME}
                        ${CURL_LIBRARY}
                )
        endif()
        if(USE_FREETYPE)
                if(FREETYPE_PKGCONFIG_FOUND)
-                       set_target_properties(${PROJECT_NAME_LOWER}
+                       set_target_properties(${PROJECT_NAME}
                                PROPERTIES
                                COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
                        )
                endif()
                target_link_libraries(
-                       ${PROJECT_NAME_LOWER}
+                       ${PROJECT_NAME}
                        ${FREETYPE_LIBRARY}
                        ${CGUITTFONT_LIBRARY}
                )
        endif()
+       if (USE_CURSES)
+               target_link_libraries(${PROJECT_NAME} ${CURSES_LIBRARIES})
+       endif()
+       if (USE_POSTGRESQL)
+               target_link_libraries(${PROJECT_NAME} ${POSTGRESQL_LIBRARY})
+       endif()
        if (USE_LEVELDB)
-               target_link_libraries(${PROJECT_NAME_LOWER} ${LEVELDB_LIBRARY})
+               target_link_libraries(${PROJECT_NAME} ${LEVELDB_LIBRARY})
        endif()
        if (USE_REDIS)
-               target_link_libraries(${PROJECT_NAME_LOWER} ${REDIS_LIBRARY})
+               target_link_libraries(${PROJECT_NAME} ${REDIS_LIBRARY})
+       endif()
+       if (USE_SPATIAL)
+               target_link_libraries(${PROJECT_NAME} ${SPATIAL_LIBRARY})
        endif()
 endif(BUILD_CLIENT)
 
 
 if(BUILD_SERVER)
-       add_executable(${PROJECT_NAME_LOWER}server ${server_SRCS})
-       add_dependencies(${PROJECT_NAME_LOWER}server GenerateVersion)
+       add_executable(${PROJECT_NAME}server ${server_SRCS})
+       add_dependencies(${PROJECT_NAME}server GenerateVersion)
        target_link_libraries(
-               ${PROJECT_NAME_LOWER}server
+               ${PROJECT_NAME}server
                ${ZLIB_LIBRARIES}
                ${SQLITE3_LIBRARY}
                ${JSON_LIBRARY}
                ${GETTEXT_LIBRARY}
                ${LUA_LIBRARY}
+               ${GMP_LIBRARY}
                ${PLATFORM_LIBS}
        )
-       set_target_properties(${PROJECT_NAME_LOWER}server PROPERTIES
+       set_target_properties(${PROJECT_NAME}server PROPERTIES
                        COMPILE_DEFINITIONS "SERVER")
+       if (USE_CURSES)
+               target_link_libraries(${PROJECT_NAME}server ${CURSES_LIBRARIES})
+       endif()
+       if (USE_POSTGRESQL)
+               target_link_libraries(${PROJECT_NAME}server ${POSTGRESQL_LIBRARY})
+       endif()
        if (USE_LEVELDB)
-               target_link_libraries(${PROJECT_NAME_LOWER}server ${LEVELDB_LIBRARY})
+               target_link_libraries(${PROJECT_NAME}server ${LEVELDB_LIBRARY})
        endif()
        if (USE_REDIS)
-               target_link_libraries(${PROJECT_NAME_LOWER}server ${REDIS_LIBRARY})
+               target_link_libraries(${PROJECT_NAME}server ${REDIS_LIBRARY})
+       endif()
+       if (USE_SPATIAL)
+               target_link_libraries(${PROJECT_NAME}server ${SPATIAL_LIBRARY})
        endif()
        if(USE_CURL)
                target_link_libraries(
-                       ${PROJECT_NAME_LOWER}server
+                       ${PROJECT_NAME}server
                        ${CURL_LIBRARY}
                )
        endif()
 endif(BUILD_SERVER)
 
+# Blacklisted locales that don't work.
+# see issue #4638
+set(GETTEXT_BLACKLISTED_LOCALES
+       be
+       he
+       ko
+       ky
+       zh_CN
+       zh_TW
+)
+
+option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)
+
+if (GETTEXT_FOUND AND APPLY_LOCALE_BLACKLIST)
+       set(GETTEXT_USED_LOCALES "")
+       foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+               if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")
+                       list(APPEND GETTEXT_USED_LOCALES ${LOCALE})
+               endif()
+       endforeach()
+       message(STATUS "Locale blacklist applied; Locales used: ${GETTEXT_USED_LOCALES}")
+endif()
 
 # Set some optimizations and tweaks
 
@@ -562,9 +709,13 @@ if(MSVC)
        # Visual Studio
 
        # EHa enables SEH exceptions (used for catching segfaults)
-       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
+       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MT /GS- /Zi /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
        #set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"")
-       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG")
+       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF")
+
+
+       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+
 
        set(CMAKE_CXX_FLAGS_SEMIDEBUG "/MDd /Zi /Ob0 /O1 /RTC1")
 
@@ -589,10 +740,17 @@ else()
        if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
                # clang does not understand __extern_always_inline but libc headers use it
                set(OTHER_FLAGS "${OTHER_FLAGS} \"-D__extern_always_inline=extern __always_inline\"")
+               set(OTHER_FLAGS "${OTHER_FLAGS} -Wsign-compare")
+       endif()
+
+       if(WIN32 AND NOT ZLIBWAPI_DLL AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+               set(OTHER_FLAGS "${OTHER_FLAGS} -DWIN32_NO_ZLIB_WINAPI")
+               message(WARNING "Defaulting to cdecl for zlib on win32 because ZLIBWAPI_DLL"
+                       " isn't set, ensure that ZLIBWAPI_DLL is set if you want stdcall.")
        endif()
 
        if(MINGW)
-               set(OTHER_FLAGS "-mthreads -fexceptions")
+               set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
        endif()
 
        set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -ffast-math -Wall -pipe -funroll-loops")
@@ -607,6 +765,10 @@ else()
        if(USE_GPROF)
                set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
        endif()
+
+       if(MINGW)
+               set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mwindows")
+       endif()
 endif()
 
 
@@ -648,7 +810,7 @@ if(WIN32)
 endif()
 
 if(BUILD_CLIENT)
-       install(TARGETS ${PROJECT_NAME_LOWER}
+       install(TARGETS ${PROJECT_NAME}
                RUNTIME DESTINATION ${BINDIR}
                LIBRARY DESTINATION ${BINDIR}
                ARCHIVE DESTINATION ${BINDIR}
@@ -664,9 +826,9 @@ if(BUILD_CLIENT)
        endif()
 
        if(USE_GETTEXT)
-               foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+               foreach(LOCALE ${GETTEXT_USED_LOCALES})
                        set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
-                       set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME_LOWER}.mo")
+                       set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
                        install(FILES ${MO_BUILD_PATH} DESTINATION ${MO_DEST_PATH})
                endforeach()
        endif()
@@ -687,16 +849,16 @@ if(BUILD_CLIENT)
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
-       install(TARGETS ${PROJECT_NAME_LOWER}server DESTINATION ${BINDIR})
+       install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR})
 endif()
 
 if (USE_GETTEXT)
        set(MO_FILES)
 
-       foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
-               set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME_LOWER}.po")
+       foreach(LOCALE ${GETTEXT_USED_LOCALES})
+               set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME}.po")
                set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
-               set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME_LOWER}.mo")
+               set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
 
                add_custom_command(OUTPUT ${MO_BUILD_PATH}
                        COMMAND ${CMAKE_COMMAND} -E make_directory ${MO_BUILD_PATH}
@@ -722,4 +884,3 @@ endif()
 if (BUILD_CLIENT AND USE_FREETYPE)
        add_subdirectory(cguittfont)
 endif()
-