Add -Wsign-compare for Clang builds and fix some signed/unsigned compiler warnings

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66c8170cbc0c4649f739405cd0a9ba238fef8a3a..89be914131bcd76f00a96a7142b22e4192f6e1a7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -143,6 +143,7 @@ endif(ENABLE_FREETYPE)
 
 find_package(Lua REQUIRED)
 
+find_package(GMP REQUIRED)
 
 option(ENABLE_LEVELDB "Enable LevelDB backend" TRUE)
 set(USE_LEVELDB FALSE)
@@ -269,7 +270,7 @@ 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}")
 
@@ -446,6 +447,7 @@ include_directories(
        ${SOUND_INCLUDE_DIRS}
        ${SQLITE3_INCLUDE_DIR}
        ${LUA_INCLUDE_DIR}
+       ${GMP_INCLUDE_DIR}
        ${JSON_INCLUDE_DIR}
        ${PROJECT_SOURCE_DIR}/script
 )
@@ -479,6 +481,7 @@ if(BUILD_CLIENT)
                ${SOUND_LIBRARIES}
                ${SQLITE3_LIBRARY}
                ${LUA_LIBRARY}
+               ${GMP_LIBRARY}
                ${JSON_LIBRARY}
                ${OPENGLES2_LIBRARIES}
                ${PLATFORM_LIBS}
@@ -532,6 +535,7 @@ if(BUILD_SERVER)
                ${JSON_LIBRARY}
                ${GETTEXT_LIBRARY}
                ${LUA_LIBRARY}
+               ${GMP_LIBRARY}
                ${PLATFORM_LIBS}
        )
        set_target_properties(${PROJECT_NAME}server PROPERTIES
@@ -586,6 +590,7 @@ 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(MINGW)