mirror of
https://github.com/zeromq/cppzmq.git
synced 2025-05-03 07:52:33 +02:00
Problem: demo does not build for libzmq pkg-config case.
It seems to be a problem with cppzmq where FindZeroMQ.cmake is not found without installing cppzmq. Solution: install cppzmq for pkg-config build type.
This commit is contained in:
parent
9b0dd89cd9
commit
88bb8b1980
@ -25,7 +25,7 @@ matrix:
|
|||||||
# GCC default, draft disabled, older libzmq with pkg-config
|
# GCC default, draft disabled, older libzmq with pkg-config
|
||||||
- os: linux
|
- os: linux
|
||||||
sudo: true
|
sudo: true
|
||||||
env: ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconf
|
env: ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconfig
|
||||||
|
|
||||||
# GCC default, draft disabled, latest libzmq
|
# GCC default, draft disabled, latest libzmq
|
||||||
- os: linux
|
- os: linux
|
||||||
|
47
ci_build.sh
47
ci_build.sh
@ -16,7 +16,7 @@ if [ "$DRAFT" = "1" ] ; then
|
|||||||
export ZEROMQ_CMAKE_FLAGS="-DENABLE_DRAFTS=ON"
|
export ZEROMQ_CMAKE_FLAGS="-DENABLE_DRAFTS=ON"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
install_zeromq() {
|
libzmq_install() {
|
||||||
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
|
||||||
@ -26,7 +26,7 @@ install_zeromq() {
|
|||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
${ZEROMQ_CMAKE_FLAGS}
|
${ZEROMQ_CMAKE_FLAGS}
|
||||||
cmake --build ${LIBZMQ} -- -j${JOBS}
|
cmake --build ${LIBZMQ} -- -j${JOBS}
|
||||||
elif [ "$BUILD_TYPE" = "pkgconf" ] ; then
|
elif [ "$BUILD_TYPE" = "pkgconfig" ] ; then
|
||||||
pushd .
|
pushd .
|
||||||
cd libzmq-${ZMQ_VERSION}
|
cd libzmq-${ZMQ_VERSION}
|
||||||
./autogen.sh &&
|
./autogen.sh &&
|
||||||
@ -37,25 +37,44 @@ install_zeromq() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# build zeromq first
|
# build zeromq first
|
||||||
|
cppzmq_build() {
|
||||||
if [ "${ZMQ_VERSION}" != "" ] ; then install_zeromq ; fi
|
|
||||||
|
|
||||||
# build cppzmq
|
|
||||||
pushd .
|
pushd .
|
||||||
ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
|
if [ "$BUILD_TYPE" = "cmake" ] ; then
|
||||||
cmake --build ${CPPZMQ} -- -j${JOBS}
|
export ZeroMQ_DIR=${LIBZMQ}
|
||||||
if [ "$BUILD_TYPE" = "pkgconf" ] ; then
|
|
||||||
pushd .
|
|
||||||
cd ${CPPZMQ} && sudo make install
|
|
||||||
popd
|
|
||||||
fi
|
fi
|
||||||
|
cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
|
||||||
|
cmake --build ${CPPZMQ} -- -j${JOBS}
|
||||||
|
if [ "$BUILD_TYPE" = "pkgconfig" ] ; then
|
||||||
|
cd ${CPPZMQ}
|
||||||
|
sudo make install
|
||||||
|
fi
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
cppzmq_tests() {
|
||||||
|
pushd .
|
||||||
cd ${CPPZMQ}
|
cd ${CPPZMQ}
|
||||||
ctest -V -j${JOBS}
|
ctest -V -j${JOBS}
|
||||||
popd
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
# build cppzmq demo
|
cppzmq_demo() {
|
||||||
ZeroMQ_DIR=${LIBZMQ} cppzmq_DIR=${CPPZMQ} cmake -Hdemo -Bdemo/build
|
pushd .
|
||||||
|
if [ "$BUILD_TYPE" = "cmake" ] ; then
|
||||||
|
export ZeroMQ_DIR=${LIBZMQ}
|
||||||
|
export cppzmq_DIR=${CPPZMQ}
|
||||||
|
fi
|
||||||
|
cmake -Hdemo -Bdemo/build
|
||||||
cmake --build demo/build
|
cmake --build demo/build
|
||||||
cd demo/build
|
cd demo/build
|
||||||
ctest -V
|
ctest -V
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ "${ZMQ_VERSION}" != "" ] ; then libzmq_install ; fi
|
||||||
|
|
||||||
|
cppzmq_build
|
||||||
|
cppzmq_tests
|
||||||
|
cppzmq_demo
|
||||||
|
Loading…
x
Reference in New Issue
Block a user