Skip to content

Commit 3f79968

Browse files
redboltzredboltz
committed
Merge branch 'herbrechtsmeier-ci'
2 parents 8833819 + 2e10ada commit 3f79968

File tree

6 files changed

+36
-22
lines changed

6 files changed

+36
-22
lines changed

‎.travis.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ install:
1010
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH="${BASE}/usr/bin:$PATH"; fi
1111
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi
1212
- if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
13-
- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
13+
- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
1414
#gtest
1515
- wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
1616
- unzip -q googletest-release-1.7.0.zip
@@ -27,7 +27,7 @@ install:
2727
# valgrind
2828
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure --prefix=${BASE}/usr > /dev/null && make -j3 > /dev/null && make install > /dev/null && cd ..; fi
2929
# boost
30-
- if [ "$BOOST" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.zip && unzip -q boost_1_63_0.zip && cd boost_1_63_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-timer --with-chrono address-model=${ARCH} install > /dev/null && cd ..; fi
30+
- if [ "$BOOST" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.zip && unzip -q boost_1_63_0.zip && cd boost_1_63_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi
3131

3232
matrix:
3333
include:
@@ -36,7 +36,7 @@ matrix:
3636
env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" BOOST="ON" SHARED="ON" CHAR_SIGN="unsigned" API_VERSION="1"
3737
- os: osx
3838
compiler: clang
39-
env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" BOOST="ON" SHARED="ON" CHAR_SIGN="signed" API_VERSION="2" X3_PARSE="ON"
39+
env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" BOOST="ON" SHARED="ON" CHAR_SIGN="signed" API_VERSION="2"
4040
- os: osx
4141
compiler: clang
4242
env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" SHARED="ON" CHAR_SIGN="signed" API_VERSION="2"
@@ -50,15 +50,15 @@ matrix:
5050
apt:
5151
sources:
5252
- ubuntu-toolchain-r-test
53-
- llvm-toolchain-precise-3.7
53+
- llvm-toolchain-precise-3.9
5454
- llvm-toolchain-precise
5555
packages:
5656
- g++-multilib
5757
- gcc-multilib
5858
- gcc-5-multilib
5959
- g++-5-multilib
6060
- bzip2
61-
- clang-3.7
61+
- clang-3.9
6262
- libc6-dbg
6363
- os: linux
6464
compiler: clang
@@ -67,7 +67,7 @@ matrix:
6767
apt:
6868
sources:
6969
- ubuntu-toolchain-r-test
70-
- llvm-toolchain-precise-3.7
70+
- llvm-toolchain-precise-3.9
7171
- llvm-toolchain-precise
7272
packages:
7373
- g++-multilib
@@ -79,7 +79,7 @@ matrix:
7979
- libc6-i386
8080
- lib32z1-dev
8181
- bzip2
82-
- clang-3.7
82+
- clang-3.9
8383
- libc6-dbg
8484
- os: linux
8585
compiler: clang
@@ -88,15 +88,15 @@ matrix:
8888
apt:
8989
sources:
9090
- ubuntu-toolchain-r-test
91-
- llvm-toolchain-precise-3.7
91+
- llvm-toolchain-precise-3.9
9292
- llvm-toolchain-precise
9393
packages:
9494
- g++-multilib
9595
- gcc-multilib
9696
- gcc-5-multilib
9797
- g++-5-multilib
9898
- bzip2
99-
- clang-3.7
99+
- clang-3.9
100100
- libc6-dbg
101101
- os: linux
102102
compiler: clang
@@ -105,7 +105,7 @@ matrix:
105105
apt:
106106
sources:
107107
- ubuntu-toolchain-r-test
108-
- llvm-toolchain-precise-3.7
108+
- llvm-toolchain-precise-3.9
109109
- llvm-toolchain-precise
110110
packages:
111111
- g++-multilib
@@ -117,7 +117,7 @@ matrix:
117117
- libc6-i386
118118
- lib32z1-dev
119119
- bzip2
120-
- clang-3.7
120+
- clang-3.9
121121
- libc6-dbg
122122
- os: linux
123123
compiler: gcc

‎CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,13 @@ IF (MSGPACK_BOOST)
9494
SET (CMAKE_CXX_FLAGS "-DMSGPACK_USE_BOOST ${CMAKE_CXX_FLAGS}")
9595
SET (Boost_USE_MULTITHREADED ON)
9696
SET (Boost_USE_STATIC_RUNTIME OFF)
97-
FIND_PACKAGE (Boost COMPONENTS chrono context timer system)
98-
IF (Boost_INCLUDE_DIRS)
99-
INCLUDE_DIRECTORIES (
100-
${Boost_INCLUDE_DIRS}
97+
FIND_PACKAGE (Boost REQUIRED COMPONENTS chrono context system timer)
98+
INCLUDE_DIRECTORIES (
99+
${Boost_INCLUDE_DIRS}
100+
)
101+
LINK_DIRECTORIES (
102+
${Boost_LIBRARY_DIRS}
101103
)
102-
ENDIF ()
103104
IF (MSGPACK_BOOST_DIR)
104105
INCLUDE_DIRECTORIES (
105106
${MSGPACK_BOOST_DIR}

‎appveyor.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
version: 2.1.0.{build}
22

3+
image:
4+
- Visual Studio 2015
35
environment:
6+
global:
7+
BOOST_ROOT: C:\Libraries\boost_1_60_0
48
matrix:
59
- cpp11: -DMSGPACK_CXX11=OFF
6-
boost: -DMSGPACK_BOOST=ON
10+
boost: -DMSGPACK_BOOST=OFF
711
msvc: '"Visual Studio 10 2010"'
812
- cpp11: -DMSGPACK_CXX11=OFF
9-
boost: -DMSGPACK_BOOST=ON
13+
boost: -DMSGPACK_BOOST=OFF
1014
msvc: '"Visual Studio 11 2012"'
1115
- cpp11: -DMSGPACK_CXX11=OFF
12-
boost: -DMSGPACK_BOOST=ON
16+
boost: -DMSGPACK_BOOST=OFF
1317
msvc: '"Visual Studio 12 2013"'
1418
- cpp11: -DMSGPACK_CXX11=ON
1519
boost: -DMSGPACK_BOOST=ON
@@ -46,7 +50,7 @@ build_script:
4650
- cd ..
4751
- md build
4852
- cd build
49-
- cmake -G %msvc% %cpp11% %boost% %x3_parse% -DMSGPACK_BOOST_DIR=C:\Libraries\\boost_1_60_0 -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
53+
- cmake -G %msvc% %cpp11% %boost% %x3_parse% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
5054
- cmake --build . --config Release
5155

5256
test_script:

‎example/cpp03/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ IF (NOT MSVC)
2222
)
2323
ENDIF ()
2424

25-
IF (Boost_TIMER_LIBRARY AND Boost_CHRONO_LIBRARY AND Boost_SYSTEM_LIBRARY)
25+
IF (MSGPACK_BOOST)
2626
LIST (APPEND with_boost_lib_PROGRAMS
2727
speed_test.cpp
2828
speed_test_nested_array.cpp

‎example/x3/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ IF (MSGPACK_USE_X3_PARSE)
77
unpack.cpp
88
parse.cpp
99
)
10-
IF (Boost_CONTEXT_LIBRARY AND Boost_SYSTEM_LIBRARY AND CMAKE_THREAD_LIBS_INIT)
10+
IF (MSGPACK_BOOST)
1111
LIST (APPEND with_boost_PROGRAMS
1212
stream_unpack.cpp
1313
)

‎example/x3/stream_unpack.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,17 @@
2121

2222
#include <boost/asio.hpp>
2323
#include <boost/coroutine2/all.hpp>
24+
25+
#if defined(__clang__)
26+
#pragma GCC diagnostic push
27+
#pragma GCC diagnostic ignored "-Wunused-parameter"
28+
#endif // defined(__clang__)
29+
2430
#include <boost/spirit/home/support/multi_pass.hpp>
2531

32+
#if defined(__clang__)
33+
#pragma GCC diagnostic pop
34+
#endif // defined(__clang__)
2635

2736
namespace as = boost::asio;
2837
namespace x3 = boost::spirit::x3;

0 commit comments

Comments
 (0)