mirror of
https://github.com/zeromq/cppzmq.git
synced 2025-05-03 07:52:33 +02:00
Problem: libzmq pkg-config build not tested
Solution: build and install libzmq using autogen tools.
This commit is contained in:
parent
6fe3d54359
commit
8dfec111f7
@ -26,9 +26,10 @@ matrix:
|
|||||||
- os: linux
|
- os: linux
|
||||||
env: ZMQ_VERSION=4.2.5
|
env: ZMQ_VERSION=4.2.5
|
||||||
|
|
||||||
# GCC default, draft disabled, older libzmq
|
# GCC default, draft disabled, older libzmq, libzmq with pkg-config
|
||||||
- os: linux
|
- os: linux
|
||||||
env: ZMQ_VERSION=4.2.4
|
sudo: true
|
||||||
|
env: ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconf
|
||||||
|
|
||||||
# GCC 7, draft enabled, latest libzmq
|
# GCC 7, draft enabled, latest libzmq
|
||||||
- os: linux
|
- os: linux
|
||||||
@ -49,8 +50,6 @@ matrix:
|
|||||||
# packages:
|
# packages:
|
||||||
# - clang-5.0
|
# - clang-5.0
|
||||||
|
|
||||||
sudo: false
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user cpp-coveralls; fi
|
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user cpp-coveralls; fi
|
||||||
|
|
||||||
|
24
ci_build.sh
24
ci_build.sh
@ -3,6 +3,7 @@
|
|||||||
set -x
|
set -x
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
BUILD_TYPE=${BUILD_TYPE:-cmake}
|
||||||
LIBZMQ=${PWD}/libzmq-build
|
LIBZMQ=${PWD}/libzmq-build
|
||||||
CPPZMQ=${PWD}/cppzmq-build
|
CPPZMQ=${PWD}/cppzmq-build
|
||||||
# Travis machines have 2 cores
|
# Travis machines have 2 cores
|
||||||
@ -19,11 +20,21 @@ install_zeromq() {
|
|||||||
curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION}.tar.gz \
|
curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION}.tar.gz \
|
||||||
>zeromq.tar.gz
|
>zeromq.tar.gz
|
||||||
tar -xvzf zeromq.tar.gz
|
tar -xvzf zeromq.tar.gz
|
||||||
cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
|
if [ "$BUILD_TYPE" = "cmake" ] ; then
|
||||||
-DZMQ_BUILD_TESTS=OFF \
|
cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DZMQ_BUILD_TESTS=OFF \
|
||||||
${ZEROMQ_CMAKE_FLAGS}
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
cmake --build ${LIBZMQ} -- -j${JOBS}
|
${ZEROMQ_CMAKE_FLAGS}
|
||||||
|
cmake --build ${LIBZMQ} -- -j${JOBS}
|
||||||
|
elif [ "$BUILD_TYPE" = "pkgconf" ] ; then
|
||||||
|
pushd .
|
||||||
|
cd libzmq-${ZMQ_VERSION}
|
||||||
|
./autogen.sh &&
|
||||||
|
./configure &&
|
||||||
|
make VERBOSE=1 -j${JOBS}
|
||||||
|
sudo make install
|
||||||
|
popd
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# build zeromq first
|
# build zeromq first
|
||||||
@ -34,6 +45,9 @@ if [ "${ZMQ_VERSION}" != "" ] ; then install_zeromq ; fi
|
|||||||
pushd .
|
pushd .
|
||||||
ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
|
ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
|
||||||
cmake --build ${CPPZMQ} -- -j${JOBS}
|
cmake --build ${CPPZMQ} -- -j${JOBS}
|
||||||
|
if [ "$BUILD_TYPE" = "pkgconf" ] ; then
|
||||||
|
sudo cmake --build ${CPPZMQ} --target install
|
||||||
|
fi
|
||||||
cd ${CPPZMQ}
|
cd ${CPPZMQ}
|
||||||
ctest -V -j${JOBS}
|
ctest -V -j${JOBS}
|
||||||
popd
|
popd
|
||||||
|
Loading…
x
Reference in New Issue
Block a user