mirror of
https://github.com/zeromq/cppzmq.git
synced 2025-05-03 07:52:33 +02:00
Problem: Travis requires sudo
sudo was required for for pkg-config libzmq build as cppzmq could not find not installed pkg-config libzmq. Solution: cppzmq to use cmake prefix paths for pkg config paths as well.
This commit is contained in:
parent
9d058b3a5e
commit
115bfffc50
@ -4,6 +4,7 @@ language: cpp
|
|||||||
|
|
||||||
dist: trusty
|
dist: trusty
|
||||||
cache: ccache
|
cache: ccache
|
||||||
|
sudo: false
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
@ -24,7 +25,6 @@ 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
|
|
||||||
env: ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconfig
|
env: ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconfig
|
||||||
|
|
||||||
# GCC default, draft disabled, default libzmq (defined in ci_build.sh)
|
# GCC default, draft disabled, default libzmq (defined in ci_build.sh)
|
||||||
|
15
ci_build.sh
15
ci_build.sh
@ -25,9 +25,9 @@ libzmq_install() {
|
|||||||
pushd .
|
pushd .
|
||||||
cd libzmq-${ZMQ_VERSION}
|
cd libzmq-${ZMQ_VERSION}
|
||||||
./autogen.sh &&
|
./autogen.sh &&
|
||||||
./configure &&
|
./configure --prefix=${LIBZMQ} &&
|
||||||
make VERBOSE=1 -j${JOBS}
|
make -j${JOBS}
|
||||||
sudo make install
|
make install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -36,9 +36,7 @@ libzmq_install() {
|
|||||||
# build zeromq first
|
# build zeromq first
|
||||||
cppzmq_build() {
|
cppzmq_build() {
|
||||||
pushd .
|
pushd .
|
||||||
if [ "${BUILD_TYPE}" = "cmake" ] ; then
|
CMAKE_PREFIX_PATH=${LIBZMQ} \
|
||||||
export ZeroMQ_DIR=${LIBZMQ}
|
|
||||||
fi
|
|
||||||
cmake -H. -B${CPPZMQ} -DENABLE_DRAFTS=${ENABLE_DRAFTS}
|
cmake -H. -B${CPPZMQ} -DENABLE_DRAFTS=${ENABLE_DRAFTS}
|
||||||
cmake --build ${CPPZMQ} -- -j${JOBS}
|
cmake --build ${CPPZMQ} -- -j${JOBS}
|
||||||
popd
|
popd
|
||||||
@ -53,10 +51,7 @@ cppzmq_tests() {
|
|||||||
|
|
||||||
cppzmq_demo() {
|
cppzmq_demo() {
|
||||||
pushd .
|
pushd .
|
||||||
if [ "${BUILD_TYPE}" = "cmake" ] ; then
|
CMAKE_PREFIX_PATH=${LIBZMQ}:${CPPZMQ} \
|
||||||
export ZeroMQ_DIR=${LIBZMQ}
|
|
||||||
fi
|
|
||||||
cppzmq_DIR=${CPPZMQ} \
|
|
||||||
cmake -Hdemo -Bdemo/build
|
cmake -Hdemo -Bdemo/build
|
||||||
cmake --build demo/build
|
cmake --build demo/build
|
||||||
cd demo/build
|
cd demo/build
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
|
||||||
find_package(PkgConfig)
|
find_package(PkgConfig)
|
||||||
pkg_check_modules(PC_LIBZMQ QUIET libzmq)
|
pkg_check_modules(PC_LIBZMQ QUIET libzmq)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user