From bc694de8ce6e0ed2a854d0b21b66e095503e0837 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 13 Feb 2016 23:23:04 +0000 Subject: Create CMake configurations in a subdirectory of infrastructure/cmake. Makes it easier to cache and remove artifacts without affecting version-controlled files. --- appveyor.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'appveyor.yml') diff --git a/appveyor.yml b/appveyor.yml index 938a0409..33327904 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,8 +28,7 @@ cache: - '..\openssl-%PLATFORM%' - '..\pcre-8.38' - '..\pcre-%PLATFORM%' - - 'infrastructure\cmake\%PLATFORM%' -# - 'infrastructure\cmake\*.dir' + - 'infrastructure\cmake\build' init: - reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v UserAuthentication /t REG_DWORD /d 0 /f @@ -37,7 +36,7 @@ init: build: parallel: true - project: infrastructure/cmake/BoxBackup.sln + project: infrastructure/cmake/build/BoxBackup.sln install: - cinst strawberryperl 7zip.commandline cmake @@ -94,8 +93,8 @@ install: - dir pcre-%PLATFORM%\lib - cd %APPVEYOR_BUILD_FOLDER% - - cd infrastructure\cmake - - cmake -G "%Generator%" -A %PLATFORM% + - cd infrastructure\cmake\build + - cmake -G "%Generator%" -A %PLATFORM% .. - cd %APPVEYOR_BUILD_FOLDER% - echo %PATH% @@ -110,8 +109,9 @@ install: - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PLATFORM% test_script: - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\*.dir - - cd %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake + - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\%PLATFORM% + - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build\*.dir + - dir %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build + - cd %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\build - ctest -C %CONFIGURATION% -V -- cgit v1.2.3