diff options
| author | Hans-Kristian Arntzen <hans-kristian.arntzen@arm.com> | 2018-03-12 21:18:27 +0300 |
|---|---|---|
| committer | Hans-Kristian Arntzen <hans-kristian.arntzen@arm.com> | 2018-03-12 21:18:27 +0300 |
| commit | 1a4a36b6cd1d960b3186d5dc67102f4dcdb84c79 (patch) | |
| tree | efab01d81f4ebcfdb13248c8543009d6ad18547c /build_glslang_spirv_tools.sh | |
| parent | 5a746ba94151275dafe80bd57696f9fd20594382 (diff) | |
Experiment a bit more with Travis.
It's hanging for some reason on OSX build of spirv-tools.
Diffstat (limited to 'build_glslang_spirv_tools.sh')
| -rwxr-xr-x | build_glslang_spirv_tools.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/build_glslang_spirv_tools.sh b/build_glslang_spirv_tools.sh index 95370507..67480896 100755 --- a/build_glslang_spirv_tools.sh +++ b/build_glslang_spirv_tools.sh @@ -1,16 +1,26 @@ #!/bin/bash +PROFILE=Release +if [ ! -z $1 ]; then + PROFILE=$1 +fi + +NPROC=$(nproc) +if [ ! -z $2 ]; then + NPROC=$2 +fi + echo "Building glslang." mkdir -p external/glslang-build cd external/glslang-build -cmake ../glslang -DCMAKE_BUILD_TYPE=Release -G"Unix Makefiles" -make -j$(nproc) +cmake ../glslang -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles" +make -j$NPROC cd ../.. echo "Building SPIRV-Tools." mkdir -p external/spirv-tools-build cd external/spirv-tools-build -cmake ../spirv-tools -DCMAKE_BUILD_TYPE=Release -G"Unix Makefiles" -make -j$(nproc) +cmake ../spirv-tools -DCMAKE_BUILD_TYPE=$PROFILE -G"Unix Makefiles" +make -j$NPROC cd ../.. |