Skip to content

Commit 4cd360c

Browse files
committed
go back to C++-11, as newer libprotobuf version actually require C++-17, which is too big of a jump for me. future versions will replace libprotobuf by a native protocol buffers implementation, which will fix this issue
1 parent f7e3ddb commit 4cd360c

File tree

3 files changed

+3
-31
lines changed

3 files changed

+3
-31
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,6 @@ jobs:
142142
run: cd build && make
143143
- name: tests
144144
run: cd build && ctest --output-on-failure
145-
macos-15-protobuf-build:
146-
runs-on: macos-15
147-
steps:
148-
- name: Checkout repository code
149-
uses: actions/checkout@v2
150-
- name: Checkout submodules
151-
run: git submodule update --init --recursive
152-
- name: install dependencies
153-
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
154-
- name: cmake
155-
run: mkdir build && cd build && cmake ..
156-
- name: make
157-
run: cd build && make
158-
- name: tests
159-
run: cd build && ctest --output-on-failure
160145
macos-15-intel-build:
161146
runs-on: macos-15-intel
162147
steps:
@@ -187,18 +172,3 @@ jobs:
187172
run: cd build && make
188173
- name: tests
189174
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 14)
2+
set(CMAKE_CXX_STANDARD 11)
33

44
project (loom)
55

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Requirements
2424
* `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

27+
Note: for compilation with newest versions of `libprotobuf` (as shipped e.g. with newer versions of MacOS), you might have to change the line `set(CMAKE_CXX_STANDARD 11)` in `CMakeLists.txt` to `set(CMAKE_CXX_STANDARD 17)`. The `libprotobuf` dependency will be removed with native protocul buffer writing some time in the future, which will resolve this issue.
28+
2729

2830
Building and Installation
2931
-------------------------

0 commit comments

Comments
 (0)