Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit198dd07

Browse files
committed
Integrate travis; Use Boost 1.57 at least; Always use shared libs from Boost.
1 parent8cb4c16 commit198dd07

File tree

3 files changed

+38
-47
lines changed

3 files changed

+38
-47
lines changed

‎.travis.yml‎

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,45 @@
11
sudo:false
22
language:cpp
3-
43
compiler:
5-
-g++
6-
-clang
7-
4+
-g++
5+
-clang
86
env:
9-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON"
10-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF"
11-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON"
12-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF"
13-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON"
14-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF"
15-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON"
16-
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF"
17-
7+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON"
8+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF"
9+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON"
10+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF"
11+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="ON"
12+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release" ENABLE_HTTPS="OFF"
13+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="ON"
14+
-BOOST_VER=1.59.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug" ENABLE_HTTPS="OFF"
1815
install:
19-
-mkdir -p ${HOME}/bin
20-
-if [ "${CC}" = "gcc" ]; then
21-
export TOOLSET="gcc";
22-
ln -s `which g++-4.8` ${HOME}/bin/g++;
23-
ln -s `which gcc-4.8` ${HOME}/bin/gcc;
24-
fi
25-
-if [ "${CC}" = "clang" ]; then
26-
export TOOLSET="clang";
27-
ln -s `which clang-3.6` ${HOME}/bin/clang;
28-
ln -s `which clang++-3.6` ${HOME}/bin/clang++;
29-
fi
30-
-export BOOST_VERSION=${BOOST_VER//./_}
31-
-export PATH=${HOME}/bin:${PATH}
32-
-travis_wait ./install-boost.sh
33-
-export BOOST_ROOT=${HOME}/${CC}-boost_${BOOST_VER//./_}
34-
-${CXX} --version
35-
16+
-mkdir -p ${HOME}/bin
17+
-if [ "${CC}" = "gcc" ]; then export TOOLSET="gcc"; ln -s `which g++-4.8` ${HOME}/bin/g++;
18+
ln -s `which gcc-4.8` ${HOME}/bin/gcc; fi
19+
-if [ "${CC}" = "clang" ]; then export TOOLSET="clang"; ln -s `which clang-3.6` ${HOME}/bin/clang;
20+
ln -s `which clang++-3.6` ${HOME}/bin/clang++; fi
21+
-export BOOST_VERSION=${BOOST_VER//./_}
22+
-export PATH=${HOME}/bin:${PATH}
23+
-travis_wait ./install-boost.sh
24+
-export BOOST_ROOT=${HOME}/${CC}-boost_${BOOST_VER//./_}
25+
-"${CXX} --version"
3626
cache:
3727
directories:
38-
-${HOME}/${CC}-boost_${BOOST_VER//./_}
39-
28+
-"${HOME}/${CC}-boost_${BOOST_VER//./_}"
4029
script:
41-
-pwd
42-
-sh -x build.sh
43-
30+
-pwd
31+
-sh -x build.sh
4432
after_failure:
45-
-cat Testing/Temporary/LastTest.log
46-
33+
-cat Testing/Temporary/LastTest.log
4734
addons:
4835
apt:
4936
sources:
50-
-ubuntu-toolchain-r-test
51-
-llvm-toolchain-precise-3.6
37+
-ubuntu-toolchain-r-test
38+
-llvm-toolchain-precise-3.6
5239
packages:
53-
-gcc-4.8
54-
-g++-4.8
55-
-clang-3.6
40+
-gcc-4.8
41+
-g++-4.8
42+
-clang-3.6
43+
notifications:
44+
slack:
45+
secure:Y7lLjqZ83+b/jaJ5+EKwvgCDeERi4bVbDn9tLp8sieTdu+ENsPI+JmLYSXZXPpe7JrItrXW6uJJXN2wG1h7au4mpVVTghd31HBzuzrqVxDphWPhp16NYzvbAgQQRBXvFVvfSdW/Kb/n2fX6xDApY0t6vNREb/GKg0GyzESb4ZjU=

‎CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,22 @@ if(NOT IS_ABSOLUTE "${INSTALL_CMAKE_DIR}")
2727
set(INSTALL_CMAKE_DIR"${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}")
2828
endif()
2929

30-
3130
if(CPP-NETLIB_BUILD_SHARED_LIBSORBUILD_SHARED_LIBS)
3231
message (STATUS"Linking boost testing libs dynamically...")
33-
set(Boost_USE_STATIC_LIBSOFF)
3432
set(CPP-NETLIB_BUILD_SHARED_LIBSON)
3533
set(BUILD_SHARED_LIBSON)
3634
add_definitions(-DBOOST_TEST_DYN_LINK)
3735
else()
38-
set(Boost_USE_STATIC_LIBSON)
3936
set(CPP-NETLIB_BUILD_SHARED_LIBSOFF)
4037
set(BUILD_SHARED_LIBSOFF)
4138
endif()
4239

40+
# Always use Boost's shared libraries.
41+
set(Boost_USE_STATIC_LIBSOFF)
42+
43+
# Always use multi-threaded Boost libraries.
4344
set(Boost_USE_MULTI_THREADEDON)
44-
find_package( Boost 1.54.0
45+
find_package( Boost 1.57.0
4546
REQUIRED unit_test_frameworksystemregex date_time thread filesystem
4647
program_options chrono atomic )
4748

‎install-boost.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ ! -d "${HOME}/${CC}-boost_${BOOST_VERSION}/include" ]; then
66
tar jxf boost_${BOOST_VERSION}.tar.bz2
77
cd boost_${BOOST_VERSION}
88
./bootstrap.sh --with-toolset=$TOOLSET --prefix=${HOME}/${CC}-boost_${BOOST_VERSION}
9-
./b2 --stagedir=. -j2 --layout=tagged variant=debug,release link=shared,static threading=multi address-model=64 cxxflags='-std=c++11' install>boost-build.log2>&1
9+
./b2 --stagedir=. -j4 --layout=tagged variant=debug,release link=shared threading=multi address-model=64 cxxflags='-std=c++11' install>boost-build.log2>&1
1010
cd ..
1111
rm -rf boost_${BOOST_VERSION}
1212
rm -rf boost_${BOOST_VERSION}.tar.bz2

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp