Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
1e2fece3
Commit
1e2fece3
authored
Dec 18, 2015
by
Feng Xiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configure conformance tests to build with C++11 (require GCC 4.8)
[skip ci]
parent
a0cecfd3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
Makefile.am
conformance/Makefile.am
+1
-0
travis.sh
travis.sh
+7
-0
No files found.
conformance/Makefile.am
View file @
1e2fece3
...
...
@@ -21,6 +21,7 @@ conformance_test_runner_SOURCES = conformance_test.cc conformance_test_runner.cc
third_party/jsoncpp/jsoncpp.cpp
nodist_conformance_test_runner_SOURCES
=
conformance.pb.cc
conformance_test_runner_CPPFLAGS
=
-I
$(top_srcdir)
/src
-I
$(srcdir)
conformance_test_runner_CXXFLAGS
=
-std
=
c++11
# Explicit deps beacuse BUILT_SOURCES are only done before a "make all/check"
# so a direct "make test_cpp" could fail if parallel enough.
conformance_test_runner-conformance_test.$(OBJEXT)
:
conformance.pb.h
...
...
travis.sh
View file @
1e2fece3
...
...
@@ -11,6 +11,13 @@
# For when some other test needs the C++ main build, including protoc and
# libprotobuf.
internal_build_cpp
()
{
# Install GCC 4.8 to replace the default GCC 4.6. We need 4.8 for more
# decent C++ 11 support in order to compile conformance tests.
sudo
add-apt-repository ppa:ubuntu-toolchain-r/test
-y
sudo
apt-get update
-qq
sudo
apt-get
install
-qq
g++-4.8
export
CXX
=
"g++-4.8"
CC
=
"gcc-4.8"
./autogen.sh
./configure
make
-j2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment