From 3d3042c1d602774a738bb3ce2c6c48f4ac5d66e3 Mon Sep 17 00:00:00 2001 From: Mike Weiblen Date: Tue, 2 May 2017 16:42:31 -0600 Subject: build: set CMAKE_INSTALL_PREFIX explicitly Recent changes to upstream CMakeFiles changed the default install location. Explicitly specify our desired install location. Changed for Linux only; Windows was already doing this. Change-Id: Id71945d426ac8f0a445dca3855bfa037870aaed9 --- update_external_sources.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update_external_sources.sh b/update_external_sources.sh index 54400230..78f21f97 100755 --- a/update_external_sources.sh +++ b/update_external_sources.sh @@ -81,7 +81,7 @@ function build_glslang () { cd "${BASEDIR}"/glslang mkdir -p build cd build - cmake -D CMAKE_BUILD_TYPE=Release .. + cmake -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install .. make -j $CORE_COUNT make install } @@ -91,7 +91,7 @@ function build_spirv-tools () { cd "${BASEDIR}"/spirv-tools mkdir -p build cd build - cmake -D CMAKE_BUILD_TYPE=Release .. + cmake -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install .. make -j $CORE_COUNT } -- cgit v1.2.3