Skip to content

Commit 115bfff

Browse files
committed
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.
1 parent 9d058b3 commit 115bfff

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ language: cpp
44

55
dist: trusty
66
cache: ccache
7+
sudo: false
78

89
matrix:
910
include:
@@ -24,7 +25,6 @@ matrix:
2425

2526
# GCC default, draft disabled, older libzmq with pkg-config
2627
- os: linux
27-
sudo: true
2828
env: ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconfig
2929

3030
# GCC default, draft disabled, default libzmq (defined in ci_build.sh)

ci_build.sh

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ libzmq_install() {
2525
pushd .
2626
cd libzmq-${ZMQ_VERSION}
2727
./autogen.sh &&
28-
./configure &&
29-
make VERBOSE=1 -j${JOBS}
30-
sudo make install
28+
./configure --prefix=${LIBZMQ} &&
29+
make -j${JOBS}
30+
make install
3131
popd
3232
fi
3333
}
@@ -36,9 +36,7 @@ libzmq_install() {
3636
# build zeromq first
3737
cppzmq_build() {
3838
pushd .
39-
if [ "${BUILD_TYPE}" = "cmake" ] ; then
40-
export ZeroMQ_DIR=${LIBZMQ}
41-
fi
39+
CMAKE_PREFIX_PATH=${LIBZMQ} \
4240
cmake -H. -B${CPPZMQ} -DENABLE_DRAFTS=${ENABLE_DRAFTS}
4341
cmake --build ${CPPZMQ} -- -j${JOBS}
4442
popd
@@ -53,10 +51,7 @@ cppzmq_tests() {
5351

5452
cppzmq_demo() {
5553
pushd .
56-
if [ "${BUILD_TYPE}" = "cmake" ] ; then
57-
export ZeroMQ_DIR=${LIBZMQ}
58-
fi
59-
cppzmq_DIR=${CPPZMQ} \
54+
CMAKE_PREFIX_PATH=${LIBZMQ}:${CPPZMQ} \
6055
cmake -Hdemo -Bdemo/build
6156
cmake --build demo/build
6257
cd demo/build

libzmq-pkg-config/FindZeroMQ.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
12
find_package(PkgConfig)
23
pkg_check_modules(PC_LIBZMQ QUIET libzmq)
34

0 commit comments

Comments
 (0)