diff options
| author | Karl Schultz <karl@lunarg.com> | 2018-06-05 14:21:36 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2018-06-06 09:34:51 -0600 |
| commit | 18119079d3d20f94639dae9c28830b85dfc16d90 (patch) | |
| tree | ad3bf2a1b318673b99cb603926a69e40a821e091 /.travis.yml | |
| parent | 917949c3da5f3bfc21c1560e20935be65637340f (diff) | |
| download | vulkan-tools-18119079d3d20f94639dae9c28830b85dfc16d90.tar.gz | |
repo: Reorg to remove Vulkan-Headers submodule
- Remove Vulkan-Headers submodule
- Add CMake code to add VULKAN_HEADERS_INSTALL_DIR and
VULKAN_LOADER_INSTALL_DIR to search when locating
Vulkan headers and loader
- CI adjustments for new model
- BUILD.md updates
- Travis-CI Android build temporarily disabled
Fixes #20
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index ff6c44bc..f3ca5b4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,15 @@ matrix: - env: CHECK_COMMIT_FORMAT=ON include: # Android build. - - os: linux - compiler: gcc - env: VULKAN_BUILD_TARGET=ANDROID ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a +# Temporary Disable +# - os: linux +# compiler: gcc +# env: VULKAN_BUILD_TARGET=ANDROID ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a # Android 64-bit build. - - os: linux - compiler: gcc - env: VULKAN_BUILD_TARGET=ANDROID ANDROID_TARGET=android-23 ANDROID_ABI=arm64-v8a +# Temporary Disable +# - os: linux +# compiler: gcc +# env: VULKAN_BUILD_TARGET=ANDROID ANDROID_TARGET=android-23 ANDROID_ABI=arm64-v8a # Linux GCC debug build. - os: linux compiler: gcc @@ -81,9 +83,8 @@ script: 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 + git clone https://github.com/KhronosGroup/Vulkan-Headers.git + cd Vulkan-Headers mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=install .. @@ -98,7 +99,7 @@ script: cd Vulkan-Loader mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Debug -DVULKAN_HEADERS_INSTALL_DIR=${TRAVIS_BUILD_DIR}/Vulkan-Headers-TMP/build/install -DCMAKE_INSTALL_PREFIX=install .. + cmake -DCMAKE_BUILD_TYPE=Debug -DVULKAN_HEADERS_INSTALL_DIR=${TRAVIS_BUILD_DIR}/Vulkan-Headers/build/install -DCMAKE_INSTALL_PREFIX=install .. make -j $core_count install cd ${TRAVIS_BUILD_DIR} fi @@ -108,7 +109,7 @@ script: cd ${TRAVIS_BUILD_DIR} mkdir build cd build - cmake -DLOADER_REPO_ROOT=${TRAVIS_BUILD_DIR}/Vulkan-Loader -DCMAKE_BUILD_TYPE=Debug .. + cmake -DCMAKE_BUILD_TYPE=Debug -DVULKAN_HEADERS_INSTALL_DIR=${TRAVIS_BUILD_DIR}/Vulkan-Headers/build/install -DVULKAN_LOADER_INSTALL_DIR=${TRAVIS_BUILD_DIR}/Vulkan-Loader/build/install .. make -j $core_count cd ${TRAVIS_BUILD_DIR} fi |