Skip to content

Commit 48a69d0

Browse files
Merge pull request #582 from simogasp/ci/switch_c++17
Switch to C++17
2 parents d4bc2ee + 40cf5a4 commit 48a69d0

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ on:
55
branches: [ "master" ]
66
pull_request:
77
branches: [ "master" ]
8+
workflow_dispatch:
9+
schedule:
10+
# every 1st day of month at 00:00 UTC
11+
- cron: "0 0 1 * *"
12+
13+
permissions:
14+
contents: read
15+
checks: read
16+
pull-requests: read
817

918
jobs:
1019
build:
@@ -16,13 +25,10 @@ jobs:
1625

1726
matrix:
1827
platform:
19-
- { name: "Ubuntu 20.04, GCC, x86_64", os: ubuntu-20.04, cpp_compiler: g++, qmake_spec: linux-g++ }
20-
- { name: "Ubuntu 20.04, Clang, x86_64", os: ubuntu-20.04, cpp_compiler: clang++, qmake_spec: linux-clang }
2128
- { name: "Ubuntu 22.04, GCC, x86_64", os: ubuntu-22.04, cpp_compiler: g++, qmake_spec: linux-g++ }
2229
- { name: "Ubuntu 22.04, Clang, x86_64", os: ubuntu-22.04, cpp_compiler: clang++, qmake_spec: linux-clang }
2330
- { name: "Ubuntu 24.04, GCC, x86_64", os: ubuntu-24.04, cpp_compiler: g++, qmake_spec: linux-g++ }
2431
- { name: "Ubuntu 24.04, Clang, x86_64", os: ubuntu-24.04, cpp_compiler: clang++, qmake_spec: linux-clang }
25-
- { name: "macOS 13, Clang, x86_64", os: macos-13, cpp_compiler: clang++, qmake_spec: macx-clang }
2632
- { name: "macOS 14, Clang, arm64", os: macos-14, cpp_compiler: clang++, qmake_spec: macx-clang }
2733
- { name: "macOS 15, Clang, arm64", os: macos-15, cpp_compiler: clang++, qmake_spec: macx-clang }
2834

Makefile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
CXX ?= g++
33
CXXWARNINGS ?= -Wall -Wextra -Wundef -pedantic
44
CXXINTRINSICS ?= -march=native
5-
CXXFEATURES ?= -funsafe-math-optimizations -fno-math-errno -std=c++14
5+
CXXFEATURES ?= -funsafe-math-optimizations -fno-math-errno -std=c++17
66
CXXFLAGS ?= ${CXXWARNINGS} ${CXXINTRINSICS} ${CXXFEATURES} -g -O3
77

88
# Delete this if OpenMP is not available (e.g., OS X without gcc)

tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ GTEST_LDFLAGS = `pkg-config --libs gtest_main`
88
SOURCES = $(wildcard math/gtest_*.cc) $(wildcard mve/gtest_*.cc) $(wildcard sfm/gtest_*.cc) $(wildcard util/gtest_*.cc) $(wildcard fssr/gtest_*.cc)
99
INCLUDES = -I${MVE_ROOT}/libs ${GTEST_CFLAGS}
1010
CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare
11-
CXXFLAGS = -std=c++14 -pthread ${CXXWARNINGS} ${INCLUDES}
11+
CXXFLAGS = -std=c++17 -pthread ${CXXWARNINGS} ${INCLUDES}
1212
LDLIBS += ${GTEST_LDFLAGS} ${LIBJPEG_LDFLAGS} ${LIBPNG_LDFLAGS} ${LIBTIFF_LDFLAGS}
1313

1414
test: ${SOURCES:.cc=.o} libmve_fssr.a libmve_sfm.a libmve.a libmve_util.a

0 commit comments

Comments
 (0)