repo: Make CI clone and install Vulkan-Headers

Change-Id: Ib1a3c82f829377814105d54f552ac3ef00f00681

diff --git a/.appveyor.yml b/.appveyor.yml
index 3a5f9bd07ff79c9f9307259c273fa628cd5bf960..e0d4037e48d94a94c27781e1505a79ca222a00af 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,12 +33,21 @@ before_build:
   - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" (set VK_VERSION=15 2017)
   - if %PLATFORM% == Win32 (set GENERATOR="Visual Studio %VS_VERSION%")
   - if %PLATFORM% == x64 (set GENERATOR="Visual Studio %VS_VERSION% Win64")
+  # Install Vulkan-Headers
+  - mkdir %TEMP%\headers
+  - git clone https://github.com/KhronosGroup/Vulkan-Headers.git %TEMP%\headers\repo
+  - ps: pushd $ENV:TEMP\headers\repo
+  - mkdir build
+  - cd build
+  - cmake -DCMAKE_INSTALL_PREFIX=%TEMP%\headers\install ..
+  - cmake --build . --target install
+  - ps: popd
   # Generate build files using CMake for the build step.
   - echo Generating CMake files for %GENERATOR%
   - cd %TOP_DIR%
   - mkdir build
   - cd build
-  - cmake -G %GENERATOR% ..
+  - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%TEMP%\headers\install ..
   - echo Building platform=%PLATFORM% configuration=%CONFIGURATION%
 
 platform:

diff --git a/.travis.yml b/.travis.yml
index cb5a598eb33822ced726a07804b32615eb3ddb1c..030ee00847fe1e0b9d7d7115fbece0029825d99e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ cache: ccache
 
 before_install:
   - set -e
+  - unset -f cd pushd popd
   - |
     if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
       # Install the appropriate Linux packages.
@@ -49,6 +50,16 @@ before_install:
       # Install the appropriate MacOS packages
       brew upgrade python3
     fi
+  - |
+    if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]] || [[ "$VULKAN_BUILD_TARGET" == "MACOS" ]]; then
+      # Install Vulkan-Headers
+      mkdir /tmp/headers
+      git clone https://github.com/KhronosGroup/Vulkan-Headers.git /tmp/headers/repo
+      pushd /tmp/headers/repo
+      cmake . -DCMAKE_INSTALL_PREFIX=/tmp/headers/install
+      cmake --build . --target install
+      popd
+    fi
   - |
     if [[ "$CHECK_FORMAT" == "ON" && "$TRAVIS_PULL_REQUEST" != "false" ]]; then
       # Install the clang format diff tool, but only for pull requests.
@@ -63,13 +74,12 @@ before_install:
 
 script:
   - set -e
-  - unset -f cd
   - |
     if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]] || [[ "$VULKAN_BUILD_TARGET" == "MACOS" ]]; then
       # Build Vulkan-Loader
       mkdir build
       cd build
-      cmake -DCMAKE_BUILD_TYPE=Debug ..
+      cmake -DCMAKE_BUILD_TYPE=Debug -DVULKAN_HEADERS_INSTALL_DIR=/tmp/headers/install ..
       make -j $core_count
       cd ..
     fi