diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2015-12-01 22:16:23 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2015-12-01 22:16:23 +0000 |
| commit | 3e7f19ca077cb369df08a0bdc93acdf3697cbc4b (patch) | |
| tree | 1aeb49caee479d1db04e23f19a0d8c493cbf4cee /appveyor.yml | |
| parent | 3f68959fa41d6c309775d2d40025795d88865226 (diff) | |
Fix Visual Studio Generator version. Install PCRE in a platform-specific directory.
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml index 1bd6b79b..04d2cf32 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,8 +20,10 @@ environment: VisualStudioVersion: 10.0 cache: - - '%APPVEYOR_BUILD_FOLDER%\..\openssl-%PLATFORM%' - '%APPVEYOR_BUILD_FOLDER%\..\openssl-1.0.2d' + - '%APPVEYOR_BUILD_FOLDER%\..\openssl-%PLATFORM%' + - '%APPVEYOR_BUILD_FOLDER%\..\pcre-8.38' + - '%APPVEYOR_BUILD_FOLDER%\..\pcre-%PLATFORM%' - '%APPVEYOR_BUILD_FOLDER%\%PLATFORM%' build: @@ -55,13 +57,13 @@ install: - ps: Start-FileDownload 'ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.zip' - 7za x pcre-8.38.zip - cd %APPVEYOR_BUILD_FOLDER%\.. - - rename pcre-8.38 pcre - - cd pcre - - cmake . -G "Visual Studio %VisualStudioVersion%" -A %PLATFORM% + - cd pcre-8.38 + - cmake . -G "Visual Studio 10" -A %PLATFORM% -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%\..\pcre-%PLATFORM%" - dir - msbuild PCRE.sln /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - cd %APPVEYOR_BUILD_FOLDER%\.. - dir + - dir pcre - cd %APPVEYOR_BUILD_FOLDER% - dir - cd infrastructure\msvc |