Fix undefined behavior in TileLayer (#12125)

[dragonfireclient.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea212bede0aea89dda943c4c724d771b441a487d..827191835d5bb2baa90fe754a4c847fbded21049 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,13 +11,14 @@ endif()
 project(minetest)
 set(PROJECT_NAME_CAPITALIZED "Minetest")
 
-set(CMAKE_CXX_STANDARD 11)
-set(GCC_MINIMUM_VERSION "4.8")
-set(CLANG_MINIMUM_VERSION "3.4")
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+set(GCC_MINIMUM_VERSION "5.1")
+set(CLANG_MINIMUM_VERSION "3.5")
 
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
 set(VERSION_MAJOR 5)
-set(VERSION_MINOR 5)
+set(VERSION_MINOR 6)
 set(VERSION_PATCH 0)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
@@ -267,11 +268,6 @@ if(NOT USE_LUAJIT)
        add_subdirectory(lib/bitop)
 endif()
 
-# JsonCpp doesn't compile well on GCC 4.8
-if(NOT USE_SYSTEM_JSONCPP)
-       set(GCC_MINIMUM_VERSION "4.9")
-endif()
-
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${GCC_MINIMUM_VERSION}")
                message(FATAL_ERROR "Insufficient gcc version, found ${CMAKE_CXX_COMPILER_VERSION}. "
@@ -286,7 +282,6 @@ endif()
 
 # Subdirectories
 # Be sure to add all relevant definitions above this
-
 add_subdirectory(src)