generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-11-04 20:31:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'herbrechtsmeier-ci'

Browse Source
This commit is contained in:
Takatoshi Kondo
2017-05-18 20:25:14 +09:00
parent 88338195c0 2e10adabb1
commit 3f79968910
6 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@@ -10,7 +10,7 @@ install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH="${BASE}/usr/bin:$PATH"; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH="${BASE}/usr/bin:$PATH"; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
- if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
#gtest #gtest
- wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip - wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
- unzip -q googletest-release-1.7.0.zip - unzip -q googletest-release-1.7.0.zip
@@ -27,7 +27,7 @@ install:
# valgrind # valgrind
- 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 - 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
# boost # boost
- 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 - 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
matrix: matrix:
include: include:
@@ -36,7 +36,7 @@ matrix:
env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" BOOST="ON" SHARED="ON" CHAR_SIGN="unsigned" API_VERSION="1" env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" BOOST="ON" SHARED="ON" CHAR_SIGN="unsigned" API_VERSION="1"
- os: osx - os: osx
compiler: clang compiler: clang
env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" BOOST="ON" SHARED="ON" CHAR_SIGN="signed" API_VERSION="2" X3_PARSE="ON" env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" BOOST="ON" SHARED="ON" CHAR_SIGN="signed" API_VERSION="2"
- os: osx - os: osx
compiler: clang compiler: clang
env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" SHARED="ON" CHAR_SIGN="signed" API_VERSION="2" env: ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64" SHARED="ON" CHAR_SIGN="signed" API_VERSION="2"
@@ -50,7 +50,7 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.9
- llvm-toolchain-precise - llvm-toolchain-precise
packages: packages:
- g++-multilib - g++-multilib
@@ -58,7 +58,7 @@ matrix:
- gcc-5-multilib - gcc-5-multilib
- g++-5-multilib - g++-5-multilib
- bzip2 - bzip2
- clang-3.7 - clang-3.9
- libc6-dbg - libc6-dbg
- os: linux - os: linux
compiler: clang compiler: clang
@@ -67,7 +67,7 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.9
- llvm-toolchain-precise - llvm-toolchain-precise
packages: packages:
- g++-multilib - g++-multilib
@@ -79,7 +79,7 @@ matrix:
- libc6-i386 - libc6-i386
- lib32z1-dev - lib32z1-dev
- bzip2 - bzip2
- clang-3.7 - clang-3.9
- libc6-dbg - libc6-dbg
- os: linux - os: linux
compiler: clang compiler: clang
@@ -88,7 +88,7 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.9
- llvm-toolchain-precise - llvm-toolchain-precise
packages: packages:
- g++-multilib - g++-multilib
@@ -96,7 +96,7 @@ matrix:
- gcc-5-multilib - gcc-5-multilib
- g++-5-multilib - g++-5-multilib
- bzip2 - bzip2
- clang-3.7 - clang-3.9
- libc6-dbg - libc6-dbg
- os: linux - os: linux
compiler: clang compiler: clang
@@ -105,7 +105,7 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.9
- llvm-toolchain-precise - llvm-toolchain-precise
packages: packages:
- g++-multilib - g++-multilib
@@ -117,7 +117,7 @@ matrix:
- libc6-i386 - libc6-i386
- lib32z1-dev - lib32z1-dev
- bzip2 - bzip2
- clang-3.7 - clang-3.9
- libc6-dbg - libc6-dbg
- os: linux - os: linux
compiler: gcc compiler: gcc

7
CMakeLists.txt
View File

@@ -94,12 +94,13 @@ IF (MSGPACK_BOOST)
SET (CMAKE_CXX_FLAGS "-DMSGPACK_USE_BOOST ${CMAKE_CXX_FLAGS}") SET (CMAKE_CXX_FLAGS "-DMSGPACK_USE_BOOST ${CMAKE_CXX_FLAGS}")
SET (Boost_USE_MULTITHREADED ON) SET (Boost_USE_MULTITHREADED ON)
SET (Boost_USE_STATIC_RUNTIME OFF) SET (Boost_USE_STATIC_RUNTIME OFF)
FIND_PACKAGE (Boost COMPONENTS chrono context timer system) FIND_PACKAGE (Boost REQUIRED COMPONENTS chrono context system timer)
IF (Boost_INCLUDE_DIRS)
INCLUDE_DIRECTORIES ( INCLUDE_DIRECTORIES (
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
) )
ENDIF () LINK_DIRECTORIES (
${Boost_LIBRARY_DIRS}
)
IF (MSGPACK_BOOST_DIR) IF (MSGPACK_BOOST_DIR)
INCLUDE_DIRECTORIES ( INCLUDE_DIRECTORIES (
${MSGPACK_BOOST_DIR} ${MSGPACK_BOOST_DIR}

12
appveyor.yml
View File

@@ -1,15 +1,19 @@
version: 2.1.0.{build} version: 2.1.0.{build}
image:
- Visual Studio 2015
environment: environment:
global:
BOOST_ROOT: C:\Libraries\boost_1_60_0
matrix: matrix:
- cpp11: -DMSGPACK_CXX11=OFF - cpp11: -DMSGPACK_CXX11=OFF
boost: -DMSGPACK_BOOST=ON boost: -DMSGPACK_BOOST=OFF
msvc: '"Visual Studio 10 2010"' msvc: '"Visual Studio 10 2010"'
- cpp11: -DMSGPACK_CXX11=OFF - cpp11: -DMSGPACK_CXX11=OFF
boost: -DMSGPACK_BOOST=ON boost: -DMSGPACK_BOOST=OFF
msvc: '"Visual Studio 11 2012"' msvc: '"Visual Studio 11 2012"'
- cpp11: -DMSGPACK_CXX11=OFF - cpp11: -DMSGPACK_CXX11=OFF
boost: -DMSGPACK_BOOST=ON boost: -DMSGPACK_BOOST=OFF
msvc: '"Visual Studio 12 2013"' msvc: '"Visual Studio 12 2013"'
- cpp11: -DMSGPACK_CXX11=ON - cpp11: -DMSGPACK_CXX11=ON
boost: -DMSGPACK_BOOST=ON boost: -DMSGPACK_BOOST=ON
@@ -46,7 +50,7 @@ build_script:
- cd .. - cd ..
- md build - md build
- cd build - cd build
- 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"' .. - 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"' ..
- cmake --build . --config Release - cmake --build . --config Release
test_script: test_script:

2
example/cpp03/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ IF (NOT MSVC)
) )
ENDIF () ENDIF ()
IF (Boost_TIMER_LIBRARY AND Boost_CHRONO_LIBRARY AND Boost_SYSTEM_LIBRARY) IF (MSGPACK_BOOST)
LIST (APPEND with_boost_lib_PROGRAMS LIST (APPEND with_boost_lib_PROGRAMS
speed_test.cpp speed_test.cpp
speed_test_nested_array.cpp speed_test_nested_array.cpp

2
example/x3/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ IF (MSGPACK_USE_X3_PARSE)
unpack.cpp unpack.cpp
parse.cpp parse.cpp
) )
IF (Boost_CONTEXT_LIBRARY AND Boost_SYSTEM_LIBRARY AND CMAKE_THREAD_LIBS_INIT) IF (MSGPACK_BOOST)
LIST (APPEND with_boost_PROGRAMS LIST (APPEND with_boost_PROGRAMS
stream_unpack.cpp stream_unpack.cpp
) )

9
example/x3/stream_unpack.cpp
View File

@@ -21,8 +21,17 @@
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/coroutine2/all.hpp> #include <boost/coroutine2/all.hpp>
#if defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#endif // defined(__clang__)
#include <boost/spirit/home/support/multi_pass.hpp> #include <boost/spirit/home/support/multi_pass.hpp>
#if defined(__clang__)
#pragma GCC diagnostic pop
#endif // defined(__clang__)
namespace as = boost::asio; namespace as = boost::asio;
namespace x3 = boost::spirit::x3; namespace x3 = boost::spirit::x3;