Skip to content

Commit f7e3ddb

Browse files
committed
bump C++ standard to C++-14, newer libprotobuf have a hard minimum C++-14 requirement. this should enable builds with libprotobuf installed on MacOS 15 and after
1 parent 1e5f88c commit f7e3ddb

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,3 +187,18 @@ jobs:
187187
run: cd build && make
188188
- name: tests
189189
run: cd build && ctest --output-on-failure
190+
macos-26-protobuf-build:
191+
runs-on: macos-26
192+
steps:
193+
- name: Checkout repository code
194+
uses: actions/checkout@v2
195+
- name: Checkout submodules
196+
run: git submodule update --init --recursive
197+
- name: install dependencies
198+
run: brew install --force --overwrite cmake && brew install --force --overwrite glpk && brew tap coin-or-tools/coinor && brew install --force --overwrite coin-or-tools/coinor/cbc && brew install protobuf
199+
- name: cmake
200+
run: mkdir build && cd build && cmake ..
201+
- name: make
202+
run: cd build && make
203+
- name: tests
204+
run: cd build && ctest --output-on-failure

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required (VERSION 3.5)
2-
set(CMAKE_CXX_STANDARD 11)
2+
set(CMAKE_CXX_STANDARD 14)
33

44
project (loom)
55

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Requirements
2121
------------
2222

2323
* `cmake`
24-
* `gcc >= 5.0` (or `clang >= 3.9`)
24+
* `gcc >= 5.1` (or `clang >= 3.9`)
2525
* Optional: `libglpk-dev` (ILP solver), `coinor-libcbc-dev` (ILP solver), `gurobi` (ILP solver), `libzip-dev`, `libprotobuf-dev` + `protobuf-compiler` (for vector tile output)
2626

2727

0 commit comments

Comments
 (0)