diff options
author | iphydf <iphydf@users.noreply.github.com> | 2016-08-24 23:52:34 +0100 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2016-09-16 11:22:23 +0100 |
commit | 37c041f8159f7e89f2585243e9b8073f47d77fd1 (patch) | |
tree | ed1f983a231f5bf7d2c24ce994feb55ee4953cda /other/travis/env-linux.sh | |
parent | c0d84ab48977f6ea80e8b5f7eca04423d4a31d26 (diff) |
Clean up Travis build a bit in preparation for osx/win.
Diffstat (limited to 'other/travis/env-linux.sh')
-rw-r--r-- | other/travis/env-linux.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/other/travis/env-linux.sh b/other/travis/env-linux.sh index 085f94e6..0eb5e9ea 100644 --- a/other/travis/env-linux.sh +++ b/other/travis/env-linux.sh | |||
@@ -1,11 +1,10 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . other/travis/env.sh | 3 | CMAKE=cmake |
4 | NPROC=`nproc` | ||
5 | CURDIR=$PWD | ||
6 | TESTS=true | ||
4 | 7 | ||
5 | RUN() { | 8 | RUN() { |
6 | "$@" | 9 | "$@" |
7 | } | 10 | } |
8 | export CMAKE=cmake | ||
9 | export MAKE=make | ||
10 | export PREFIX=$PWD/_install | ||
11 | export NPROC=`nproc` | ||