From: Karl Schultz <karl@lunarg.com>
Date: Tue, 6 Feb 2018 13:12:35 +0000 (-0700)
Subject: build: Adjust travis config for VT updates
X-Git-Tag: upstream/1.1.92~460
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e46624892ce3ac068acb633af846a77fa9b0619;p=platform%2Fupstream%2FVulkan-Tools.git

build: Adjust travis config for VT updates

- VT update external script no longer accepts jsoncpp flag
  so remove call to build it.  The script now builds it all the time.
- Add back cmake flag to turn off LVL layers build.  LVL should
  now build the layer utils even with layer build disabled.  VT
  needs the layer utils to build devsim.

Change-Id: I1c5421d4b5553b3d39f68f075ee5850588696775
---

diff --git a/.travis.yml b/.travis.yml
index c24ca37..45e1188 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,11 +73,10 @@ script:
       git clone https://github.com/LunarG/VulkanTools.git
       cd VulkanTools
       # Get as little as possible from external sources
-      ./update_external_sources.sh --jsoncpp
       ./update_external_sources.sh --glslang --no-build
       # Build as few components as possible
       cmake -H. -Bbuild -DBUILD_LOADER=NO -DBUILD_TESTS=NO \
-          -DBUILD_DEMOS=NO -DBUILD_VKTRACE=NO \
+          -DBUILD_LAYERS=NO -DBUILD_DEMOS=NO -DBUILD_VKTRACE=NO \
           -DBUILD_VKJSON=NO -DBUILD_VIA=NO -DBUILD_ICD=NO
       make -C build -j $core_count
       cd ${TRAVIS_BUILD_DIR}