From 41171772ed428dddffe9263e30627b51032cbfd2 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Sat, 10 Feb 2024 21:26:10 -0600 Subject: [PATCH] Reverting experimental c++17 mode (mac build failures with Catch code). Disabling GitHub windows builders for now - since they are using bleeding edge opencv and protobuf, which is incompatible with my old Cmake and old Opencv installs. --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9cbeeab..1b5b2788 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: sys: - { os: ubuntu-20.04, shell: bash } - { os: ubuntu-22.04, shell: bash } - - { os: windows-2022, shell: 'msys2 {0}' } + #- { os: windows-2022, shell: 'msys2 {0}' } Disabled until we upgrade to C++17 and find_package(Protobuf CONFIG REQUIRED) compiler: - { cc: gcc, cxx: g++ } - { cc: clang, cxx: clang++ } diff --git a/CMakeLists.txt b/CMakeLists.txt index 31d8446e..19848cba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND endif() #### Set C++ standard level -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF)