Commented out debug statements again

[oweals/minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 61fb206804ef1eac743cf9b8ad219cb1bd2cc823..80ee0fc649fe4399a1a808b85cb34c9932b876a8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,19 @@
-project(minetest-delta)
+project(minetest)
 cmake_minimum_required( VERSION 2.6 )
 
 if(RUN_IN_PLACE)
        add_definitions ( -DRUN_IN_PLACE )
 endif(RUN_IN_PLACE)
 
-if(USE_GETTEXT)
-       find_package(GettextLib REQUIRED)
+# user-visible option to enable/disable gettext usage
+OPTION(ENABLE_GETTEXT "Use GetText for internationalization" ON)
+
+# this is only set to 1 if gettext is enabled _and_ available
+set(USE_GETTEXT 0)
+
+find_package(GettextLib)
+
+if(GETTEXT_FOUND AND ENABLE_GETTEXT)
        message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
        message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
        if(WIN32)
@@ -14,16 +21,13 @@ if(USE_GETTEXT)
                message(STATUS "gettext dll: ${GETTEXT_DLL}")
                message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
        endif()
-       if (GETTEXT_FOUND)
-               add_definitions( -DUSE_GETTEXT )
-               message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
-       else()
-               message(STATUS "ERROR: GetText enabled but not found, disabling")
-               set(USE_GETTEXT FALSE)
-       endif(GETTEXT_FOUND)
-else(USE_GETTEXT)
+       set(USE_GETTEXT 1)
+       message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
+elseif(GETTEXT_FOUND AND NOT ENABLE_GETTEXT)
+       MESSAGE(STATUS "GetText found but disabled;")
+else(GETTEXT_FOUND AND ENABLE_GETTEXT)
        message(STATUS "GetText disabled")
-endif(USE_GETTEXT)
+endif(GETTEXT_FOUND AND ENABLE_GETTEXT)
 
 if(NOT MSVC)
        set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
@@ -123,8 +127,14 @@ set(common_SRCS
        test.cpp
        sha1.cpp
        base64.cpp
+       ban.cpp
 )
 
+# This gives us the icon
+if(WIN32 AND MSVC)
+       set(common_SRCS ${common_SRCS} winresource.rc)
+endif()
+
 # Client sources
 set(minetest_SRCS
        ${common_SRCS}
@@ -132,6 +142,7 @@ set(minetest_SRCS
        mapblock_mesh.cpp
        farmesh.cpp
        keycode.cpp
+       camera.cpp
        clouds.cpp
        clientobject.cpp
        guiMainMenu.cpp
@@ -164,7 +175,7 @@ include_directories(
        ${SQLITE3_INCLUDE_DIR}
 )
 
-set(EXECUTABLE_OUTPUT_PATH ../bin)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 if(BUILD_CLIENT)
        add_executable(${PROJECT_NAME} ${minetest_SRCS})
@@ -200,6 +211,8 @@ endif(BUILD_SERVER)
 # Set some optimizations and tweaks
 #
 
+include(CheckCXXCompilerFlag)
+
 if(MSVC)
        # Visual Studio
 
@@ -226,8 +239,11 @@ else()
                set(RELEASE_WARNING_FLAGS "")
        endif()
        
-       if(NOT APPLE)
-               set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
+       if(NOT APPLE AND NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+               CHECK_CXX_COMPILER_FLAG("-Wno-unused-but-set-variable" HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
+               if(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
+                       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
+               endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
        endif()
        
        if(APPLE)
@@ -266,7 +282,7 @@ if(BUILD_CLIENT)
 
        install(FILES ${images} DESTINATION ${DATADIR})
 
-       if (USE_GETTEXT)
+       if(USE_GETTEXT)
                foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
                        set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
                        set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
@@ -298,15 +314,16 @@ endif(BUILD_SERVER)
 
 if (USE_GETTEXT)
        set(MO_FILES)
+
        foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+               set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/minetest.po")
                set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
+               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}
                        COMMENT "mo-update [${LOCALE}]: Creating locale directory.")
 
-               set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
-               set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/minetest.po")
-
                add_custom_command(
                        OUTPUT ${MO_FILE_PATH}
                        COMMAND ${GETTEXT_MSGFMT} -o ${MO_FILE_PATH} ${PO_FILE_PATH}