build: Update travis VulkanTools cmake options
Convert cmake command to use _INSTALL_DIR semantic for VulkanTools
Change-Id: I05a664e3b99ded6305e5325e5857c0b5ac4a9a0c
diff --git a/.travis.yml b/.travis.yml
index 5b16cfb..d1baea6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,20 +84,6 @@
fi
- |
if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
- # Get VulkanTools and build DevSim
- mkdir -p external
- cd external
- git clone https://github.com/LunarG/VulkanTools.git
- cd VulkanTools
- ./update_external_sources.sh
- # Build as few components as possible
- cmake -H. -Bbuild -DGLSLANG_REPO_ROOT=${TRAVIS_BUILD_DIR}/glslang -DBUILD_LOADER=NO -DBUILD_TESTS=NO \
- -DBUILD_DEMOS=NO -DBUILD_VKTRACE=NO -DBUILD_VLF=NO -DBUILD_VKJSON=NO -DBUILD_VIA=NO -DBUILD_ICD=NO
- make -C build -j $core_count
- cd ${TRAVIS_BUILD_DIR}
- fi
- - |
- if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
# Build Vulkan-Headers
cd ${TRAVIS_BUILD_DIR}
git clone https://github.com/KhronosGroup/Vulkan-Headers.git Vulkan-Headers
@@ -110,6 +96,22 @@
fi
- |
if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
+ # Get VulkanTools and build DevSim
+ mkdir -p external
+ cd external
+ git clone https://github.com/LunarG/VulkanTools.git
+ cd VulkanTools
+ ./update_external_sources.sh
+ # Build as few components as possible
+ cmake -H. -Bbuild -DGLSLANG_INSTALL_DIR=${TRAVIS_BUILD_DIR}/glslang/build/install \
+ -DVULKAN_HEADERS_INSTALL_DIR=${TRAVIS_BUILD_DIR}/Vulkan-Headers/build/install \
+ -DBUILD_LOADER=NO -DBUILD_TESTS=NO \
+ -DBUILD_DEMOS=NO -DBUILD_VKTRACE=NO -DBUILD_VLF=NO -DBUILD_VKJSON=NO -DBUILD_VIA=NO -DBUILD_ICD=NO
+ make -C build -j $core_count
+ cd ${TRAVIS_BUILD_DIR}
+ fi
+ - |
+ if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
# Build Vulkan-Loader for Vulkan-ValidationLayers
cd ${TRAVIS_BUILD_DIR}
git clone https://github.com/KhronosGroup/Vulkan-Loader.git
