Fix formspec list spacing (#10861)

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5d4fae0e60fa69ec4e58ab99c6608b8565dd76c..b6bba6e8db0ac36fd8bdbf87b19b839bccf18520 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 project(minetest)
 
 INCLUDE(CheckIncludeFiles)
@@ -124,27 +122,6 @@ option(ENABLE_FREETYPE "Enable FreeType2 (TrueType fonts and basic unicode suppo
 set(USE_FREETYPE FALSE)
 
 if(ENABLE_FREETYPE)
-##
-## Note: FindFreetype.cmake seems to have been fixed in recent versions of
-## CMake. If issues persist, re-enable this workaround specificially for the
-## failing platforms.
-##
-#      if(UNIX)
-#              include(FindPkgConfig)
-#              if(PKG_CONFIG_FOUND)
-#                      pkg_check_modules(FREETYPE QUIET freetype2)
-#                      if(FREETYPE_FOUND)
-#                              SET(FREETYPE_PKGCONFIG_FOUND TRUE)
-#                              SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
-#                              # Because CMake is idiotic
-#                              string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
-#                              string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
-#                      endif(FREETYPE_FOUND)
-#              endif(PKG_CONFIG_FOUND)
-#      endif(UNIX)
-#      if(NOT FREETYPE_FOUND)
-#              find_package(Freetype)
-#      endif()
        find_package(Freetype)
        if(FREETYPE_FOUND)
                message(STATUS "Freetype enabled.")
@@ -677,10 +654,11 @@ endif(BUILD_SERVER)
 # Blacklisted locales that don't work.
 # see issue #4638
 set(GETTEXT_BLACKLISTED_LOCALES
-       be
+       ar
        he
-       ko
        ky
+       ms_Arab
+       th
 )
 
 option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)