openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Jonathan Thomas
2024-02-10 21:26:10 -06:00
parent c7620c9d2d
commit 41171772ed
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -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++ }

2
CMakeLists.txt
View File

@@ -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)