File tree Expand file tree Collapse file tree 2 files changed +8
-27
lines changed Expand file tree Collapse file tree 2 files changed +8
-27
lines changed Original file line number Diff line number Diff line change @@ -106,7 +106,15 @@ matrix:
106
106
# packages:
107
107
# - clang-5.0
108
108
109
+ before_script :
110
+ - mkdir -p /tmp/cmake.root
111
+ - [[ $TRAVIS_OS_SUFFIX = 'linux' ]]; then CMAKE_PKG_SUFFIX="linux-x86_64"; else CMAKE_PKG_SUFFIX="macos10.10-universal"; fi
112
+ - wget -qO- "https://cmake.org/files/v3.20/cmake-3.20.5-$CMAKE_PKG_SUFFIX.tar.gz" | tar --strip-components=1 -xz -C /tmp/cmake.root
113
+ - [[ $TRAVIS_OS_SUFFIX = 'linux' ]]; then CMAKE_BIN_DIR="CMake.app/Contents/bin"; else CMAKE_BIN_DIR="bin"; fi
114
+ - export PATH=/tmp/cmake.root/$CMAKE_BIN_DIR:$PATH
115
+
109
116
# Build and check this project
110
117
script :
111
118
- eval "${MATRIX_EVAL}"
119
+ - cmake --version
112
120
- ./ci_build.sh
Original file line number Diff line number Diff line change @@ -12,31 +12,6 @@ CPPZMQ=${PWD}/cppzmq-build
12
12
# Travis machines have 2 cores
13
13
JOBS=2
14
14
15
- cmake_install () {
16
- local CMAKE_INSTALL_DIR=/tmp/cmake.root
17
- local CMAKE_SUFFIX=" none"
18
-
19
- if [ $TRAVIS_OS_NAME = " linux" ]; then
20
- CMAKE_SUFFIX=" linux-x86_64"
21
- elif [ $TRAVIS_OS_NAME = " osx" ]; then
22
- CMAKE_SUFFIX=" macos10.10-universal"
23
- else
24
- echo " TRAVIS_OS_NAME $TRAVIS_OS_NAME not expected"
25
- exit 1
26
- fi
27
-
28
- mkdir -p $CMAKE_INSTALL_DIR
29
- wget -qO- " https://cmake.org/files/v3.20/cmake-3.20.5-$CMAKE_SUFFIX .tar.gz" \
30
- | tar --strip-components=1 -xz -C $CMAKE_INSTALL_DIR
31
-
32
- if [ $TRAVIS_OS_NAME = " linux" ]; then
33
- export PATH=$CMAKE_INSTALL_DIR /bin:$PATH
34
- elif [ $TRAVIS_OS_NAME = " osx" ]; then
35
- export PATH=$CMAKE_INSTALL_DIR /CMake.app/Contents/bin:$PATH
36
- fi
37
- cmake --version
38
- }
39
-
40
15
libzmq_install () {
41
16
curl -L https://github.com/zeromq/libzmq/archive/v" ${ZMQ_VERSION} " .tar.gz \
42
17
> zeromq.tar.gz
@@ -87,8 +62,6 @@ cppzmq_demo() {
87
62
popd
88
63
}
89
64
90
- cmake_install
91
-
92
65
if [ " ${ZMQ_VERSION} " != " " ] ; then libzmq_install ; fi
93
66
94
67
cppzmq_build
You can’t perform that action at this time.
0 commit comments