diff options
| author | Karl Schultz <karl@lunarg.com> | 2018-05-12 14:24:42 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2018-05-12 14:24:42 -0600 |
| commit | 59b5b812e72c0fe931de9dcf461cb4fe793c62b7 (patch) | |
| tree | 7e3289663f9766f66a8f534aab59f7611e793b3a /.appveyor.yml | |
| parent | 45b7c1e36c050f8a8fc1058418c80c3c4486505e (diff) | |
| download | vulkan-validation-layers-59b5b812e72c0fe931de9dcf461cb4fe793c62b7.tar.gz | |
repo: Fix AppVeyor
This time for sure.
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index de9b8cedf..8ad36bd8e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,7 @@ branches: before_build: - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%" - echo. - - echo Starting build for %APPVEYOR_REPO_NAME% + - echo Starting build for %APPVEYOR_REPO_NAME% in %APPVEYOR_BUILD_FOLDER% - git submodule update --init --recursive # Determine the appropriate CMake generator for the current version of Visual Studio - echo Determining VS version @@ -40,31 +40,33 @@ before_build: - del /Q /F vsversion.tmp - if %PLATFORM% == Win32 (set GENERATOR="Visual Studio %VS_VERSION%") - if %PLATFORM% == x64 (set GENERATOR="Visual Studio %VS_VERSION% Win64") + - if %PLATFORM% == Win32 (set BUILD_DIR="build32") + - if %PLATFORM% == x64 (set BUILD_DIR="build") # Build Vulkan-Loader - echo Building Vulkan-Loader for %PLATFORM% %CONFIGURATION% - - cd %TOP_DIR% + - cd %APPVEYOR_BUILD_FOLDER% - git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader.git - cd Vulkan-Loader - - mkdir build - - cd build + - mkdir %BUILD_DIR% + - cd %BUILD_DIR% - cmake -G %GENERATOR% .. - - cmake --build . --config %CONFIGURATION% + - cmake --build . --config %CONFIGURATION% -- /maxcpucount # Build glslang - echo Building glslang for %PLATFORM% %CONFIGURATION% - - cd %TOP_DIR% + - cd %APPVEYOR_BUILD_FOLDER% - git clone https://github.com/KhronosGroup/glslang.git - cd glslang - update_glslang_sources.py - - mkdir build - - cd build + - mkdir %BUILD_DIR% + - cd %BUILD_DIR% - cmake -G %GENERATOR% -DCMAKE_INSTALL_PREFIX=install .. - - cmake --build . --config %CONFIGURATION% + - cmake --build . --config %CONFIGURATION% -- /maxcpucount # Generate build files using CMake for the build step. - - echo Generating CMake files for %PLATFORM% %CONFIGURATION% - - cd %TOP_DIR% + - echo Generating Vulkan-ValidationLayers CMake files for %PLATFORM% %CONFIGURATION% + - cd %APPVEYOR_BUILD_FOLDER% - mkdir build - cd build - - cmake -G %GENERATOR% -DGLSLANG_REPO_ROOT=../../glslang -DLOADER_REPO_ROOT=../../Vulkan-Loader .. + - cmake -G %GENERATOR% -DGLSLANG_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\glslang -DLOADER_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\Vulkan-Loader .. - echo Building platform=%PLATFORM% configuration=%CONFIGURATION% platform: |