File tree Expand file tree Collapse file tree 2 files changed +22
-9
lines changed Expand file tree Collapse file tree 2 files changed +22
-9
lines changed Original file line number Diff line number Diff line change @@ -26,9 +26,10 @@ matrix:
26
26
- os : linux
27
27
env : ZMQ_VERSION=4.2.5
28
28
29
- # GCC default, draft disabled, older libzmq
29
+ # GCC default, draft disabled, older libzmq, libzmq with pkg-config
30
30
- os : linux
31
- env : ZMQ_VERSION=4.2.4
31
+ sudo : true
32
+ env : ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconf
32
33
33
34
# GCC 7, draft enabled, latest libzmq
34
35
- os : linux
@@ -49,8 +50,6 @@ matrix:
49
50
# packages:
50
51
# - clang-5.0
51
52
52
- sudo : false
53
-
54
53
before_install :
55
54
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user cpp-coveralls; fi
56
55
Original file line number Diff line number Diff line change 3
3
set -x
4
4
set -e
5
5
6
+ BUILD_TYPE=${BUILD_TYPE:- cmake}
6
7
LIBZMQ=${PWD} /libzmq-build
7
8
CPPZMQ=${PWD} /cppzmq-build
8
9
# Travis machines have 2 cores
@@ -19,11 +20,21 @@ install_zeromq() {
19
20
curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION} .tar.gz \
20
21
> zeromq.tar.gz
21
22
tar -xvzf zeromq.tar.gz
22
- cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
23
- -DZMQ_BUILD_TESTS=OFF \
24
- -DCMAKE_BUILD_TYPE=Release \
25
- ${ZEROMQ_CMAKE_FLAGS}
26
- cmake --build ${LIBZMQ} -- -j${JOBS}
23
+ if [ " $BUILD_TYPE " = " cmake" ] ; then
24
+ cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
25
+ -DZMQ_BUILD_TESTS=OFF \
26
+ -DCMAKE_BUILD_TYPE=Release \
27
+ ${ZEROMQ_CMAKE_FLAGS}
28
+ cmake --build ${LIBZMQ} -- -j${JOBS}
29
+ elif [ " $BUILD_TYPE " = " pkgconf" ] ; then
30
+ pushd .
31
+ cd libzmq-${ZMQ_VERSION}
32
+ ./autogen.sh &&
33
+ ./configure &&
34
+ make VERBOSE=1 -j${JOBS}
35
+ sudo make install
36
+ popd
37
+ fi
27
38
}
28
39
29
40
# build zeromq first
@@ -34,6 +45,9 @@ if [ "${ZMQ_VERSION}" != "" ] ; then install_zeromq ; fi
34
45
pushd .
35
46
ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
36
47
cmake --build ${CPPZMQ} -- -j${JOBS}
48
+ if [ " $BUILD_TYPE " = " pkgconf" ] ; then
49
+ sudo cmake --build ${CPPZMQ} --target install
50
+ fi
37
51
cd ${CPPZMQ}
38
52
ctest -V -j${JOBS}
39
53
popd
You can’t perform that action at this time.
0 commit comments