From 726d5e91b55d4742dcbd6b0a82d84788dbb117b7 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Sat, 8 Feb 2020 18:14:09 +0100 Subject: Build: Enable and require c++17 (#23868) * Build: Enable and require c++17 * Build: Raise Visual Studio version from 2017 15.2 to 2017 15.9 * Build: Raise GCC version from 6.3.0 to 7.1.0 * Reduce branch differences * Fix build after latest merge * Cleanup after latest merge --- cmake/compiler/msvc/settings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/compiler/msvc/settings.cmake') diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 9704b35d6c0..ed98273e22a 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -1,7 +1,7 @@ # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -set(MSVC_EXPECTED_VERSION 19.10) +set(MSVC_EXPECTED_VERSION 19.16) set(MSVC_EXPECTED_VERSION_STRING "MSVC 2017") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MSVC_EXPECTED_VERSION) -- cgit v1.2.3