diff options
| author | Mike Weiblen <mikew@lunarg.com> | 2017-05-02 16:42:31 -0600 |
|---|---|---|
| committer | Mike Weiblen (LunarG) <mikew-lunarg@users.noreply.github.com> | 2017-05-03 10:07:33 -0600 |
| commit | 3d3042c1d602774a738bb3ce2c6c48f4ac5d66e3 (patch) | |
| tree | 5cda48d1b49a5a1cb791963b04b409d0f6d32aef | |
| parent | 8c475bc0ac1a758bb67907a5ca0f3b475bce3e48 (diff) | |
| download | usermoji-3d3042c1d602774a738bb3ce2c6c48f4ac5d66e3.tar.xz | |
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
| -rwxr-xr-x | update_external_sources.sh | 4 |
1 files 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 } |