Skip to content

Commit dfc90bb

Browse files
authored
Merge pull request #36 from OpenSimulationInterface/no-sudo
Remove need for sudo
2 parents 69d1687 + 9286849 commit dfc90bb

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Source: https://github.com/boostorg/hana/blob/master/.travis.yml
22

3-
# Sudo is required for installing recent versions of dependencies.
4-
sudo: required
5-
63
# Use C++ build environment.
74
language: cpp
85

@@ -32,8 +29,8 @@ install:
3229
# Install a recent version of the Protobuf
3330
- |
3431
PROTOBUF_URL="https://github.com/google/protobuf/releases/download/v3.2.0/protobuf-cpp-3.2.0.tar.gz"
35-
if [ ! -f ${DEPS_DIR}/protobuf/src/.libs/protoc ] ; then mkdir -p protobuf ; travis_retry wget --no-check-certificate --quiet -O - ${PROTOBUF_URL} | tar --strip-components=1 -xz -C protobuf ; cd protobuf ; ./configure --prefix=/usr ; make ; else cd protobuf ; fi
36-
sudo make install
32+
if [ ! -f ${DEPS_DIR}/protobuf/install/bin/protoc ] ; then mkdir -p protobuf ; travis_retry wget --no-check-certificate --quiet -O - ${PROTOBUF_URL} | tar --strip-components=1 -xz -C protobuf ; cd protobuf ; ./configure --prefix=${DEPS_DIR}/protobuf/install ; make ; make install ; fi
33+
export PATH=${DEPS_DIR}/protobuf/install/bin:${PATH}
3734
3835
# Change directory back to default build directory.
3936
before_script:
@@ -43,7 +40,7 @@ before_script:
4340
script:
4441
- mkdir -p build
4542
- cd build
46-
- cmake ..
43+
- cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
4744
- cmake --build .
4845
- cd ..
4946
- python setup.py build

0 commit comments

Comments
 (0)