Skip to content

Commit

Permalink
Raise C++ version to C++14
Browse files Browse the repository at this point in the history
GoogleTest requires C++14 since 1.13.0 (see release notes [1]).

This is required for running CI on macOS with GitHub Actions in a
later commit because Homebrew will install GoogleTest 1.15.2 [2].

[1] https://github.com/google/googletest/releases/tag/v1.13.0
[2] https://formulae.brew.sh/formula/googletest
  • Loading branch information
andre-schulz committed Aug 23, 2024
1 parent 1c27c2f commit 3879e44
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
CXX ?= g++
CXXWARNINGS ?= -Wall -Wextra -Wundef -pedantic
CXXINTRINSICS ?= -march=native
CXXFEATURES ?= -funsafe-math-optimizations -fno-math-errno -std=c++11
CXXFEATURES ?= -funsafe-math-optimizations -fno-math-errno -std=c++14
CXXFLAGS ?= ${CXXWARNINGS} ${CXXINTRINSICS} ${CXXFEATURES} -g -O3

# Delete this if OpenMP is not available (e.g., OS X without gcc)
Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GTEST_LDFLAGS = `pkg-config --libs gtest_main`
SOURCES = $(wildcard math/gtest_*.cc) $(wildcard mve/gtest_*.cc) $(wildcard sfm/gtest_*.cc) $(wildcard util/gtest_*.cc) $(wildcard fssr/gtest_*.cc)
INCLUDES = -I${MVE_ROOT}/libs ${GTEST_CFLAGS}
CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare
CXXFLAGS = -std=c++11 -pthread ${CXXWARNINGS} ${INCLUDES}
CXXFLAGS = -std=c++14 -pthread ${CXXWARNINGS} ${INCLUDES}
LDLIBS += ${GTEST_LDFLAGS} ${LIBJPEG_LDFLAGS} ${LIBPNG_LDFLAGS} ${LIBTIFF_LDFLAGS}

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

0 comments on commit 3879e44

Please sign in to comment.