Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require C++11 if protobuf version >= 3.6.0 is installed #990

Merged
merged 6 commits into from
Aug 3, 2018
Merged

Require C++11 if protobuf version >= 3.6.0 is installed #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fe7cde
Require C++11 if protobuf version >= 3.6.0 is installed
cgull Jul 23, 2018
9ba0729
Fix Homebrew failure on Travis.
cgull Aug 3, 2018
26143e9
Allow Travis to use its preferred MacOS/XCode image.
cgull Aug 3, 2018
3ea9e3e
mosh-server: improve error logging
cgull Aug 3, 2018
5cdbad6
Ignore select() errors on Travis/MacOS.
cgull Aug 3, 2018
ace6324
Display CPU count on Travis/MacOS.
cgull Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ language: cpp
sudo: required
dist: trusty

# Use macOS 10.12 + Xcode 9.1 + DEPLOYMENT_TARGET=10.12
osx_image: xcode9.1
# Use whatever Travis likes + DEPLOYMENT_TARGET=10.12
# osx_image: xcode9.1

# Linux dependencies
addons:
Expand Down Expand Up @@ -63,6 +63,10 @@ before_script:

# 'make distcheck', and OS X package build on tag builds.
script:
- |
if test osx = "${TRAVIS_OS_NAME}"; then
sysctl hw.ncpu
fi
- ./autogen.sh
- ./configure --enable-compile-warnings=error --enable-examples
- make distcheck VERBOSE=1 V=1
Expand Down
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ AS_IF([test x"$PROTOC" = x],
# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

AS_IF([pkg-config --atleast-version 3.6.0 protobuf],
[AX_CXX_COMPILE_STDCXX([11], [noext])])

WARNING_CXXFLAGS=""
PICKY_CXXFLAGS=""
DISTCHECK_CXXFLAGS=""
Expand Down
Loading