diff options
| author | Karl Schultz <karl@lunarg.com> | 2018-06-05 10:50:43 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2018-06-05 12:40:43 -0600 |
| commit | ce066b313fe96dcfc08417aa2114b0ae1f21c8a3 (patch) | |
| tree | 48d492ecce3e42268b0ff30074f940578e4720c0 | |
| parent | 4ba65cdf65f7f6692f8d1828a6585117803dcea5 (diff) | |
| download | usermoji-ce066b313fe96dcfc08417aa2114b0ae1f21c8a3.tar.xz | |
build: Fix CI for updated Vulkan-Loader
Adapt to Vulkan-Loader getting rid of Vulkan-Headers submodule.
Get and build Vulkan-Headers and fix Vulkan-Loader build to use it.
| -rw-r--r-- | .appveyor.yml | 14 | ||||
| -rw-r--r-- | .travis.yml | 18 |
2 files changed, 27 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 28807398..f6338855 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -50,14 +50,24 @@ before_build: - 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-Headers + - echo Building Vulkan-Headers for %PLATFORM% %CONFIGURATION% + - cd %APPVEYOR_BUILD_FOLDER% + # Need different name here until Vulkan-Tools stops having Vulkan-Headers as a submodule. + - git clone https://github.com/KhronosGroup/Vulkan-Headers.git Vulkan-Headers-TMP + - cd Vulkan-Headers-TMP + - mkdir %BUILD_DIR% + - cd %BUILD_DIR% + - cmake -G %GENERATOR% -DCMAKE_INSTALL_PREFIX=install .. + - cmake --build . --config %CONFIGURATION% --target install -- /maxcpucount # Build Vulkan-Loader - echo Building Vulkan-Loader for %PLATFORM% %CONFIGURATION% - cd %APPVEYOR_BUILD_FOLDER% - - git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader.git + - git clone https://github.com/KhronosGroup/Vulkan-Loader.git - cd Vulkan-Loader - mkdir %BUILD_DIR% - cd %BUILD_DIR% - - cmake -G %GENERATOR% .. + - cmake -G %GENERATOR% -DVULKAN_HEADERS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%/Vulkan-Headers-TMP/%BUILD_DIR%/install .. - cmake --build . --config %CONFIGURATION% -- /maxcpucount # Generate build files using CMake for the build step. - echo Generating Vulkan-Tools CMake files for %PLATFORM% %CONFIGURATION% diff --git a/.travis.yml b/.travis.yml index 474d203d..d9b09d9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,16 +77,28 @@ before_install: script: - set -e + if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then + # Build Vulkan-Headers + cd ${TRAVIS_BUILD_DIR} + # Need different name here until Vulkan-Tools stops having Vulkan-Headers as a submodule. + git clone https://github.com/KhronosGroup/Vulkan-Headers.git Vulkan-Headers-TMP + cd Vulkan-Headers-TMP + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=install .. + make -j $core_count install + cd ${TRAVIS_BUILD_DIR} + fi - | if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then # Build Vulkan-Loader for Vulkan-Tools cd ${TRAVIS_BUILD_DIR} - git clone --recurse-submodules https://github.com/KhronosGroup/Vulkan-Loader.git + git clone https://github.com/KhronosGroup/Vulkan-Loader.git cd Vulkan-Loader mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Debug .. - make -j $core_count + cmake -DCMAKE_BUILD_TYPE=Debug -DVULKAN_HEADERS_INSTALL_DIR=${TRAVIS_BUILD_DIR}/Vulkan-Headers-TMP/build/install -DCMAKE_INSTALL_PREFIX=install .. + make -j $core_count install cd ${TRAVIS_BUILD_DIR} fi - | |