From d59a73be5b998db6f142881705bff76c3135689d Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 10 Apr 2020 18:56:55 -1000 Subject: [PATCH] Exclude CMake CXX standard from MSVC --- CMakeLists.txt | 6 ++++-- logvisor | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8d2920..8127b9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) # because of c++17 project(boo) cmake_policy(SET CMP0074 NEW) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) +if (NOT MSVC) + set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +endif() set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/logvisor b/logvisor index f04a977..27814c5 160000 --- a/logvisor +++ b/logvisor @@ -1 +1 @@ -Subproject commit f04a9777eb034ff28200ec109511455627736a81 +Subproject commit 27814c527622538d384336c4d43cf5b4b6869859