From 10a78d91af1e97b8c4ae3b3ec14dc7da301df854 Mon Sep 17 00:00:00 2001 From: andrea Date: Wed, 10 Aug 2022 11:40:34 +0200 Subject: [PATCH] remove unused CXX standards. change boost min version to 1.65 reintroduce c++14 --- cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake index d0641b2284..313165fe52 100644 --- a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake +++ b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake @@ -17,9 +17,9 @@ macro(CompilerChecksAndSetups) add_definitions(-DHAVE_SNPRINTF) endif() - # Allow developers to use Boost < 1.55 + # Allow developers to use Boost < 1.65 if (NOT BOOST_MIN_VERSION) - set(BOOST_MIN_VERSION 1.55) + set(BOOST_MIN_VERSION 1.65) endif() # For older cmake versions the variable 'CMAKE_CXX_COMPILER_VERSION' is missing @@ -48,8 +48,6 @@ macro(CompilerChecksAndSetups) set(CMAKE_CXX_STANDARD 17) elseif(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+14") set(CMAKE_CXX_STANDARD 14) - elseif (${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+11") - set(CMAKE_CXX_STANDARD 11) endif() # Log the compiler and version