From 0bcef76a7b314c1cf034990bd893bdec29e18618 Mon Sep 17 00:00:00 2001 From: Jammyjamjamman Date: Mon, 22 Apr 2019 20:43:23 +0100 Subject: [PATCH] making sure builds always installed to the same dir. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d740409f4..9cd077f34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,13 +66,13 @@ script: | mkdir build; cd build; cmake .. -DCMAKE_INSTALL_PREFIX=/usr; - make && make install; + fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then mkdir build; cd build; cmake .. -DCMAKE_INSTALL_PREFIX=/usr; - make && make install; + echo 'Dependencies:'; otool -L glest; fi @@ -80,7 +80,7 @@ script: | mkdir build; cd build; cmake .. -DFORCE_EMBEDDED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr; - make && make install; + fi make -j$(nproc) && make install DESTDIR=../Glest; cd ..;