Merge pull request #136 from traintastic/ci-macos-13

CI: remove macos-11, add macos-13
Dieser Commit ist enthalten in:
Reinder Feenstra 2024-06-16 14:23:34 +02:00 committet von GitHub
Commit ad1b62e151
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
2 geänderte Dateien mit 14 neuen und 10 gelöschten Zeilen

Datei anzeigen

@ -60,8 +60,8 @@ jobs:
build_deb: true
defines: "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
- name: "macos-11"
os: "macos-11"
- name: "macos-12"
os: "macos-12"
generator: "Unix Makefiles"
arch: ""
target: traintastic-client
@ -70,12 +70,12 @@ jobs:
build_deb: false
defines: ""
- name: "macos-12"
os: "macos-12"
- name: "macos-13"
os: "macos-13"
generator: "Unix Makefiles"
arch: ""
target: traintastic-client
jobs: 3
jobs: 4
build_type: Release
build_deb: false
defines: ""
@ -257,8 +257,8 @@ jobs:
defines: "-DINSTALL_SYSTEMD_SERVICE=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
ccov: false
- name: "macos-11"
os: "macos-11"
- name: "macos-12"
os: "macos-12"
generator: "Unix Makefiles"
arch: ""
toolset: ""
@ -269,13 +269,13 @@ jobs:
defines: ""
ccov: false
- name: "macos-12"
os: "macos-12"
- name: "macos-13"
os: "macos-13"
generator: "Unix Makefiles"
arch: ""
toolset: ""
target: all
jobs: 3
jobs: 4
build_type: Release
build_deb: false
defines: ""

Datei anzeigen

@ -222,6 +222,10 @@ else()
list(REMOVE_ITEM SOURCES ${SOCKET_CAN_SOURCES})
endif()
if(APPLE)
add_definitions(-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) # remove once boost is updated
endif()
if(WIN32)
add_definitions(-D_WIN32_WINNT=0x0601)
file(GLOB SOURCES_WINDOWS "src/os/windows/*.hpp" "src/os/windows/*.cpp")