File tree Expand file tree Collapse file tree 3 files changed +7
-11
lines changed Expand file tree Collapse file tree 3 files changed +7
-11
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ language: cpp
4
4
5
5
dist : trusty
6
6
cache : ccache
7
+ sudo : false
7
8
8
9
matrix :
9
10
include :
@@ -24,7 +25,6 @@ matrix:
24
25
25
26
# GCC default, draft disabled, older libzmq with pkg-config
26
27
- os : linux
27
- sudo : true
28
28
env : ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconfig
29
29
30
30
# GCC default, draft disabled, default libzmq (defined in ci_build.sh)
Original file line number Diff line number Diff line change @@ -25,9 +25,9 @@ libzmq_install() {
25
25
pushd .
26
26
cd libzmq-${ZMQ_VERSION}
27
27
./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
31
31
popd
32
32
fi
33
33
}
@@ -36,9 +36,7 @@ libzmq_install() {
36
36
# build zeromq first
37
37
cppzmq_build () {
38
38
pushd .
39
- if [ " ${BUILD_TYPE} " = " cmake" ] ; then
40
- export ZeroMQ_DIR=${LIBZMQ}
41
- fi
39
+ CMAKE_PREFIX_PATH=${LIBZMQ} \
42
40
cmake -H. -B${CPPZMQ} -DENABLE_DRAFTS=${ENABLE_DRAFTS}
43
41
cmake --build ${CPPZMQ} -- -j${JOBS}
44
42
popd
@@ -53,10 +51,7 @@ cppzmq_tests() {
53
51
54
52
cppzmq_demo () {
55
53
pushd .
56
- if [ " ${BUILD_TYPE} " = " cmake" ] ; then
57
- export ZeroMQ_DIR=${LIBZMQ}
58
- fi
59
- cppzmq_DIR=${CPPZMQ} \
54
+ CMAKE_PREFIX_PATH=${LIBZMQ} :${CPPZMQ} \
60
55
cmake -Hdemo -Bdemo/build
61
56
cmake --build demo/build
62
57
cd demo/build
Original file line number Diff line number Diff line change
1
+ set (PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON )
1
2
find_package (PkgConfig )
2
3
pkg_check_modules (PC_LIBZMQ QUIET libzmq )
3
4
You can’t perform that action at this time.
0 commit comments