From 90bacdd60364b90512398428663ff3c1cb840c56 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Fri, 31 Jul 2015 02:46:54 +0200 Subject: [PATCH] Fixed libcsptr not being detected in the CI cmake script --- .ci/install-libcsptr.sh | 2 +- .travis.yml | 1 + appveyor.yml | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/install-libcsptr.sh b/.ci/install-libcsptr.sh index 9e0d17d..088f06b 100755 --- a/.ci/install-libcsptr.sh +++ b/.ci/install-libcsptr.sh @@ -8,7 +8,7 @@ git clone --branch ${tag} --depth 1 ${repo} dependencies/libcsptr && cd dependencies/libcsptr && mkdir build && cd $_ && - cmake -DCMAKE_INSTALL_PREFIX=$HOME "$@" .. && + cmake -DCMAKE_INSTALL_PREFIX=$LOCAL_INSTALL "$@" .. && make && make install ) diff --git a/.travis.yml b/.travis.yml index a1bca84..b9bc2f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ addons: - gettext - cmake before_install: +- export LOCAL_INSTALL="$HOME" - ".ci/install-libcsptr.sh" - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib - export CFLAGS="-g -O0" diff --git a/appveyor.yml b/appveyor.yml index ebe230c..2ade1ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,10 @@ configuration: Release install: - 'set GCOV_PREFIX=%APPVEYOR_BUILD_FOLDER%' + - 'set LOCAL_INSTALL=%APPVEYOR_BUILD_FOLDER%' - 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0