aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Schultz <karl@lunarg.com>2018-02-06 06:12:35 -0700
committerKarl Schultz <karl@lunarg.com>2018-02-06 10:34:38 -0700
commit4e46624892ce3ac068acb633af846a77fa9b0619 (patch)
tree06f292b9ce240456ba01416bcd370dea9a47d54a
parent42eea52502936acd9fc440312d638494943fea1a (diff)
downloadusermoji-4e46624892ce3ac068acb633af846a77fa9b0619.tar.xz
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
-rw-r--r--.travis.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index c24ca37b..45e1188e 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}