Build with c++14. Upgrade capnproto-c++ to 0.7.0 in travis config.
This commit is contained in:
parent
debd250ddc
commit
1ff258d090
2 changed files with 13 additions and 10 deletions
19
.travis.yml
19
.travis.yml
|
@ -8,14 +8,17 @@ env:
|
|||
- export PKG_CONFIG_PATH="$HOME/lib/pkgconfig"
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- gcc
|
||||
- g++
|
||||
- gcc-7
|
||||
- g++-7
|
||||
|
||||
install:
|
||||
- curl -O https://capnproto.org/capnproto-c++-0.5.3.tar.gz
|
||||
- tar zxf capnproto-c++-0.5.3.tar.gz
|
||||
- cd capnproto-c++-0.5.3
|
||||
- ./configure --prefix=$HOME
|
||||
- curl -O https://capnproto.org/capnproto-c++-0.7.0.tar.gz
|
||||
- tar zxf capnproto-c++-0.7.0.tar.gz
|
||||
- cd capnproto-c++-0.7.0
|
||||
- ./configure --prefix=$HOME CC=gcc-7 CXX=g++-7
|
||||
- make -j3
|
||||
- make install
|
||||
- cd ../
|
||||
|
@ -25,8 +28,8 @@ jdk:
|
|||
- openjdk7
|
||||
- openjdk8
|
||||
script:
|
||||
- make
|
||||
- make addressbook
|
||||
- make CC=gcc-7 CXX=g++-7
|
||||
- make CC=gcc-7 CXX=g++-7 addressbook
|
||||
- sbt test
|
||||
- sbt doc
|
||||
|
||||
|
|
4
Makefile
4
Makefile
|
@ -8,7 +8,7 @@ CAPNP_CXX_FLAGS=-I $(CAPNP_PREFIX)/include -L $(CAPNP_PREFIX)/lib -lkj -lcapnp
|
|||
endif
|
||||
|
||||
CXX=g++
|
||||
CXX_FLAGS=-std=c++11 $(CAPNP_CXX_FLAGS)
|
||||
CXX_FLAGS=-std=c++14 $(CAPNP_CXX_FLAGS)
|
||||
|
||||
CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++
|
||||
|
||||
|
@ -25,7 +25,7 @@ capnpc-java : $(CAPNPC_JAVA_SOURCES)
|
|||
|
||||
MINGW_LIBS=~/src/capnproto/c++/build-mingw/.libs/libcapnp.a ~/src/capnproto/c++/build-mingw/.libs/libkj.a
|
||||
MINGW_CXX=i686-w64-mingw32-g++
|
||||
MINGW_FLAGS=-O2 -DNDEBUG -I/usr/local/include -std=c++11 -static -static-libgcc -static-libstdc++
|
||||
MINGW_FLAGS=-O2 -DNDEBUG -I/usr/local/include -std=c++14 -static -static-libgcc -static-libstdc++
|
||||
capnpc-java.exe : $(CAPNPC_JAVA_SOURCES)
|
||||
$(MINGW_CXX) $(MINGW_FLAGS) $(CAPNPC_JAVA_SOURCES) $(MINGW_LIBS) -o capnpc-java.exe
|
||||
|
||||
|
|
Loading…
Reference in a new issue