mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #6315: CI(freebsd): Build with C++17

Browse Source 
The protobuf version on the FreeBSD CI image that we are using requires
C++17.
This commit is contained in:
Robert Adam 2024-01-21 10:42:47 +01:00 committed by GitHub
commit 4fa4c654e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -12,7 +12,7 @@ freebsd_task:
fetch_submodules_script: git submodule --quiet update --init --recursive
build_script:
- mkdir build && cd build
- cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -Dtests=ON -Dsymbols=ON ..
- cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -Dtests=ON -Dsymbols=ON -DCMAKE_CXX_STANDARD=17 ..
- cmake --build .
test_script:
- cd build

10
CMakeLists.txt
View File

@ -37,10 +37,6 @@ project(mumble
set(3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/3rdparty")
set(PLUGINS_DIR "${CMAKE_SOURCE_DIR}/plugins")
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
list(APPEND CMAKE_MODULE_PATH
"${CMAKE_SOURCE_DIR}/cmake"
"${CMAKE_SOURCE_DIR}/cmake/FindModules"
@ -48,6 +44,12 @@ list(APPEND CMAKE_MODULE_PATH
"${3RDPARTY_DIR}/cmake-compiler-flags"
)
if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
include(pkg-utils)
include(project-utils)