From 7c6ed8b2ee9a0d44b58a92f2a5feb916bfbed9c3 Mon Sep 17 00:00:00 2001 From: Jeremy Cohen Date: Wed, 6 May 2020 19:03:33 +0100 Subject: [PATCH] Updating CMake changes to move min version to 3.5.1 --- CMakeLists.txt | 26 ++++----------------- cmake/ThirdPartyHDF5.cmake | 4 ---- cmake/thirdparty-patches/CMakeLists_CCM.txt | 2 +- templates/executable/CMakeLists.txt | 3 +-- 4 files changed, 7 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b09fe4ade..b9097dd31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.1.3) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1) SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") @@ -14,26 +14,10 @@ IF (POLICY CMP0074) CMAKE_POLICY(SET CMP0074 OLD) ENDIF() -# Nektar++ requires C++11. Try to infer this for older CMake versions (less than -# 3.1.0) -IF ("${CMAKE_VERSION}" VERSION_LESS "3.1") - IF (NOT MSVC) - INCLUDE(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) - - IF (COMPILER_SUPPORTS_CXX11) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - ELSE() - MESSAGE(FATAL_ERROR "Nektar++ requires a compiler with C++11 support.") - ENDIF() - ELSEIF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0) - MESSAGE(FATAL_ERROR "Nektar++ requires full C++11 support: please upgrade to Visual Studio 2013 or later") - ENDIF() -ELSE() - SET(CMAKE_CXX_STANDARD 11) - SET(CMAKE_CXX_STANDARD_REQUIRED ON) - SET(CMAKE_CXX_EXTENSIONS OFF) -ENDIF() +# Nektar++ requires C++11. +SET(CMAKE_CXX_STANDARD 11) +SET(CMAKE_CXX_STANDARD_REQUIRED ON) +SET(CMAKE_CXX_EXTENSIONS OFF) INCLUDE(CheckLanguage) diff --git a/cmake/ThirdPartyHDF5.cmake b/cmake/ThirdPartyHDF5.cmake index 89feb885b..c062dd833 100644 --- a/cmake/ThirdPartyHDF5.cmake +++ b/cmake/ThirdPartyHDF5.cmake @@ -33,10 +33,6 @@ IF (NEKTAR_USE_HDF5) "NEKTAR_USE_HDF5" OFF) IF(THIRDPARTY_BUILD_HDF5) - IF (CMAKE_VERSION VERSION_LESS 3.1.0) - MESSAGE(FATAL_ERROR "HDF5 compilation requires CMake 3.1.0 or later.") - ENDIF() - INCLUDE(ExternalProject) EXTERNALPROJECT_ADD( hdf5-1.8.16 diff --git a/cmake/thirdparty-patches/CMakeLists_CCM.txt b/cmake/thirdparty-patches/CMakeLists_CCM.txt index c54e0b65d..8210f8981 100644 --- a/cmake/thirdparty-patches/CMakeLists_CCM.txt +++ b/cmake/thirdparty-patches/CMakeLists_CCM.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1) PROJECT(libccmio) # compile in Release mode by default diff --git a/templates/executable/CMakeLists.txt b/templates/executable/CMakeLists.txt index 5e9c03c13..1361a451a 100644 --- a/templates/executable/CMakeLists.txt +++ b/templates/executable/CMakeLists.txt @@ -4,8 +4,7 @@ # projects are marked below. ###################################################### -# Require at least CMake 3.1 for CMAKE_CXX_STANDARD. -CMAKE_MINIMUM_REQUIRED(VERSION 3.1) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1) # TODO - Put the name of your project here. PROJECT(ExampleSolver) -- GitLab