From a58dd92c8491d2eaadb875b001814d426120043e Mon Sep 17 00:00:00 2001 From: Snaipe Date: Fri, 31 Jul 2015 00:31:45 +0200 Subject: [PATCH] Fixed appveyor build & libcsptr installation --- .ci/install-libcsptr.sh | 6 +++--- appveyor.yml | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.ci/install-libcsptr.sh b/.ci/install-libcsptr.sh index ae68416..9e0d17d 100755 --- a/.ci/install-libcsptr.sh +++ b/.ci/install-libcsptr.sh @@ -6,9 +6,9 @@ mkdir dependencies git clone --branch ${tag} --depth 1 ${repo} dependencies/libcsptr && ( cd dependencies/libcsptr && - ./autogen.sh && - ./configure --prefix=$HOME "$@" && + mkdir build && + cd $_ && + cmake -DCMAKE_INSTALL_PREFIX=$HOME "$@" .. && make && make install ) -rm -Rf dependencies diff --git a/appveyor.yml b/appveyor.yml index 4f33076..ebe230c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,6 @@ os: Windows Server 2012 init: - git config --global core.autocrlf input - - C:\MinGW\bin\mingw-get install mingw32-autotools curl - 'SET PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin' environment: @@ -23,19 +22,18 @@ configuration: Release install: - 'set GCOV_PREFIX=%APPVEYOR_BUILD_FOLDER%' - - 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0