diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2018-06-04 11:25:06 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2018-06-04 16:29:58 -0600 |
| commit | 2b9706a03f84d98923f39af0608019f335a940c6 (patch) | |
| tree | 8f3e9ea1030fa967e9b5fe6d8a596f1238159250 /.appveyor.yml | |
| parent | 56176a26a465036837b92c338ac5321a68897430 (diff) | |
| download | vulkan-validation-layers-2b9706a03f84d98923f39af0608019f335a940c6.tar.gz | |
build: Update CI for Vulkan-Headers ext dependency
The Headers are no longer a submodule of the ValidationLayers repo.
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 09000a4bf..c13076127 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -45,10 +45,8 @@ before_build: # Build Vulkan-Headers - echo Building Vulkan-Headers for %PLATFORM% %CONFIGURATION% - cd %APPVEYOR_BUILD_FOLDER% - # Need to name this directory differently since Vulkan-ValidationLayers still has - # Vulkan-Headers as a submodule. - - git clone https://github.com/KhronosGroup/Vulkan-Headers.git Vulkan-Headers-TMP - - cd Vulkan-Headers-TMP + - git clone https://github.com/KhronosGroup/Vulkan-Headers.git Vulkan-Headers + - cd Vulkan-Headers - mkdir %BUILD_DIR% - cd %BUILD_DIR% - cmake -G %GENERATOR% -DCMAKE_INSTALL_PREFIX=install .. @@ -60,7 +58,7 @@ before_build: - cd Vulkan-Loader - mkdir %BUILD_DIR% - cd %BUILD_DIR% - - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers-TMP/%BUILD_DIR%/install .. + - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers/%BUILD_DIR%/install .. - cmake --build . --config %CONFIGURATION% -- /maxcpucount # Build glslang - echo Building glslang for %PLATFORM% %CONFIGURATION% @@ -79,7 +77,7 @@ before_build: - cd %APPVEYOR_BUILD_FOLDER% - mkdir build - cd build - - cmake -G %GENERATOR% -DGLSLANG_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\glslang -DLOADER_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\Vulkan-Loader .. + - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers/%BUILD_DIR%/install -DGLSLANG_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\glslang -DLOADER_REPO_ROOT=%APPVEYOR_BUILD_FOLDER%\Vulkan-Loader .. - echo Building platform=%PLATFORM% configuration=%CONFIGURATION% platform: |