diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d1af5c36..84b8215be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,11 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) # because of CMAKE_CXX_STANDARD + cmake_policy(SET CMP0054 NEW) project(urde) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + if(MSVC) if(${CMAKE_GENERATOR} MATCHES "Visual Studio*") set(VS_DEFINES "/MP") @@ -22,7 +27,7 @@ if(MSVC) else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}\ - -std=c++14 -Wno-multichar -fno-exceptions -Wno-narrowing -Wno-nullability-completeness -Werror=return-type") + -Wno-multichar -fno-exceptions -Wno-narrowing -Wno-nullability-completeness -Werror=return-type") if(APPLE) set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto=thin") diff --git a/amuse b/amuse index 3d56d5f0c..4e7c31849 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 3d56d5f0ccd10a558f0e47746cfd64126da09380 +Subproject commit 4e7c31849d5c9e1e274fa86fc74d3cbecf9e11de diff --git a/hecl b/hecl index e3516a055..da67582f2 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit e3516a0557385b74c80668dd637b72ac944b15ba +Subproject commit da67582f23559060c842c7daa75bec31efbc816f diff --git a/jbus b/jbus index b8c42676c..3c4a99fbe 160000 --- a/jbus +++ b/jbus @@ -1 +1 @@ -Subproject commit b8c42676ce9055bc48f9f7d75eb9f8964e6cfda3 +Subproject commit 3c4a99fbe87e8f043636a6c18bb791bb21a4d115 diff --git a/kabufuda b/kabufuda index 03f16f7f4..2401875b9 160000 --- a/kabufuda +++ b/kabufuda @@ -1 +1 @@ -Subproject commit 03f16f7f48d1f9316eefcb8118496def40da47db +Subproject commit 2401875b9a391a3126a5bbfee452bd4db4f3b014 diff --git a/nod b/nod index 671e73c4b..55ed73b9b 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit 671e73c4bc98a6a3f94c768a046b5489b524d63f +Subproject commit 55ed73b9bb1ec76303a79fd07f80728acbe5a46b diff --git a/specter b/specter index 59f00d829..05b504a63 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 59f00d82970cd5a424775273988983d7ad0516a5 +Subproject commit 05b504a639d9b8e2d332403cec0c634c642095ea diff --git a/visigen/CMakeLists.txt b/visigen/CMakeLists.txt index 909f08ead..24c3be161 100644 --- a/visigen/CMakeLists.txt +++ b/visigen/CMakeLists.txt @@ -1,11 +1,14 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) # because of CMAKE_CXX_STANDARD project(visigen) +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}\ - -std=c++14 -Wno-multichar -fno-exceptions -Wno-narrowing -Wno-nullability-completeness -Werror=return-type") + -Wno-multichar -fno-exceptions -Wno-narrowing -Wno-nullability-completeness -Werror=return-type") endif() if(APPLE)