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.
OpenShot · Feb 11, 2024 · 4117177 · 4117177
1 parent c7620c9
commit 4117177
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)