Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/KhronosGroup/SPIRV-Cross.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Kristian Arntzen <hans-kristian.arntzen@arm.com>2018-10-27 13:02:58 +0300
committerHans-Kristian Arntzen <hans-kristian.arntzen@arm.com>2018-10-27 14:20:58 +0300
commitdd121bb9b5b0364085f4d7d2c165ece248f99545 (patch)
treec2268c821692c943a9a47af8bc56746a5b725bc9
parent76d62383158371c164eba261319f4e56484b4336 (diff)
Try release build for Travis.travis-windows-releasetravis-windows
-rw-r--r--.travis.yml6
-rwxr-xr-xbuild_glslang_spirv_tools.sh4
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index a1f922bf..0d2fed20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,6 @@ script:
- ./build_glslang_spirv_tools.sh Release
- mkdir build
- cd build
- - cmake .. -DCMAKE_BUILD_TYPE=Debug -G "${GENERATOR}" -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON3}"
- - cmake --build .
- - PATH="../external/glslang-build/output/bin:../external/spirv-tools-build/output/bin:$PATH" ctest --verbose -C Debug
+ - cmake .. -DCMAKE_BUILD_TYPE=Release -G "${GENERATOR}" -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON3}"
+ - cmake --build . --config Release
+ - PATH="../external/glslang-build/output/bin:../external/spirv-tools-build/output/bin:$PATH" ctest --verbose -C Release
diff --git a/build_glslang_spirv_tools.sh b/build_glslang_spirv_tools.sh
index 1095f303..7689c267 100755
--- a/build_glslang_spirv_tools.sh
+++ b/build_glslang_spirv_tools.sh
@@ -13,13 +13,13 @@ echo "Building glslang."
mkdir -p external/glslang-build
cd external/glslang-build
cmake ../glslang -DCMAKE_BUILD_TYPE=$PROFILE -DCMAKE_INSTALL_PREFIX=output
-cmake --build . --target install ${NPROC}
+cmake --build . --config $PROFILE --target install ${NPROC}
cd ../..
echo "Building SPIRV-Tools."
mkdir -p external/spirv-tools-build
cd external/spirv-tools-build
cmake ../spirv-tools -DCMAKE_BUILD_TYPE=$PROFILE -DSPIRV_WERROR=OFF -DCMAKE_INSTALL_PREFIX=output
-cmake --build . --target install ${NPROC}
+cmake --build . --config $PROFILE --target install ${NPROC}
cd ../..