File tree Expand file tree Collapse file tree 5 files changed +27
-21
lines changed Expand file tree Collapse file tree 5 files changed +27
-21
lines changed Original file line number Diff line number Diff line change @@ -17,13 +17,13 @@ addons:
17
17
18
18
env :
19
19
matrix :
20
- # - BUILD_TYPE =cmake DRAFT=enabled
21
- - BUILD_TYPE =cmake ZMQ_VERSION=4.2.5
22
- - BUILD_TYPE=cmake ZMQ_VERSION=4.2.0
20
+ # - ZMQ_BUILD_TYPE =cmake DRAFT=enabled
21
+ - ZMQ_BUILD_TYPE =cmake ZMQ_VERSION=4.2.5
22
+ - ZMQ_BUILD_TYPE=pkgconf ZMQ_VERSION=4.2.0
23
23
24
24
matrix :
25
25
include :
26
- # - env: BUILD_TYPE =cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format
26
+ # - env: ZMQ_BUILD_TYPE =cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format
27
27
# os: linux
28
28
# addons:
29
29
# apt:
@@ -39,15 +39,15 @@ matrix:
39
39
packages :
40
40
- g++-7
41
41
env :
42
- - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" BUILD_TYPE =cmake ZMQ_VERSION=4.2.5 DRAFT=1
42
+ - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" ZMQ_BUILD_TYPE =cmake ZMQ_VERSION=4.2.5 DRAFT=1
43
43
44
44
sudo : required
45
45
46
46
before_install :
47
47
- pip install --user cpp-coveralls
48
-
49
- # Build and check this project according to the BUILD_TYPE
50
- script :
48
+
49
+ # Build and check this project according to the ZMQ_BUILD_TYPE
50
+ script :
51
51
- eval "${MATRIX_EVAL}"
52
52
- ./ci_build.sh
53
53
Original file line number Diff line number Diff line change @@ -71,7 +71,6 @@ cpp zmq (which will also include libzmq for you).
71
71
#find cppzmq wrapper, installed by make of cppzmq
72
72
find_package(cppzmq)
73
73
if(cppzmq_FOUND)
74
- include_directories(${ZeroMQ_INCLUDE_DIR} ${cppzmq_INCLUDE_DIR})
75
74
target_link_libraries(*Your Project Name* ${cppzmq_LIBRARY})
76
75
endif()
77
76
```
Original file line number Diff line number Diff line change @@ -16,18 +16,31 @@ install_zeromq() {
16
16
curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION} .tar.gz \
17
17
> zeromq.tar.gz
18
18
tar -xvzf zeromq.tar.gz
19
- cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
20
- -DZMQ_BUILD_TESTS=OFF \
21
- -DCMAKE_BUILD_TYPE=Release \
22
- ${ZEROMQ_CMAKE_FLAGS}
23
- cmake --build ${LIBZMQ}
19
+ if [ " ${ZMQ_BUILD_TYPE} " = " cmake" ] ; then
20
+ cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
21
+ -DZMQ_BUILD_TESTS=OFF \
22
+ -DCMAKE_BUILD_TYPE=Release \
23
+ ${ZEROMQ_CMAKE_FLAGS}
24
+ cmake --build ${LIBZMQ}
25
+ elif [ " ${ZMQ_BUILD_TYPE} " = " pkgconf" ] ; then
26
+ pushd .
27
+ cd libzmq-${ZMQ_VERSION}
28
+ ./autogen.sh
29
+ ./configure
30
+ sudo make VERBOSE=1 -j5 install
31
+ popd
32
+ else
33
+ echo " Unsupported build type ${ZMQ_BUILD_TYPE} ."
34
+ exit 1
35
+ fi
24
36
}
25
37
26
38
# build zeromq first
27
39
28
40
if [ " ${ZMQ_VERSION} " != " " ] ; then install_zeromq ; fi
29
41
30
42
# build cppzmq
43
+ # for pkgconf ZMQ_BUILD_TYPE ZeroMQ_DIR is invalid but it should still work
31
44
pushd .
32
45
ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
33
46
cmake --build ${CPPZMQ}
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
2
2
3
3
project (cppzmq-demo CXX )
4
4
5
- find_package (cppzmq REQUIRED )
5
+ find_package (cppzmq )
6
6
7
7
enable_testing ()
8
8
add_executable (
@@ -15,9 +15,6 @@ target_link_libraries(
15
15
cppzmq
16
16
)
17
17
18
- target_include_directories (demo PRIVATE ${cppzmq_INCLUDE_DIR}
19
- ${ZeroMQ_INCLUDE_DIR} )
20
-
21
18
add_test (
22
19
NAME
23
20
demo
Original file line number Diff line number Diff line change @@ -36,9 +36,6 @@ target_link_libraries(
36
36
cppzmq
37
37
)
38
38
39
- target_include_directories (unit_tests PRIVATE ${cppzmq_INCLUDE_DIR}
40
- ${ZeroMQ_INCLUDE_DIR} )
41
-
42
39
add_test (
43
40
NAME
44
41
unit
You can’t perform that action at this time.
0 commit comments