Skip to content

G
glslang
Commit f21c173a by John Kessenich Committed by GitHub
Options

Merge pull request #1071 from antiagainst/ninja-make

Travis: use make instead of ninja
parents 9cf5dfbd afa128a8
Showing with 5 additions and 10 deletions
.travis.yml
...@@ -39,11 +39,8 @@ addons: ...@@ -39,11 +39,8 @@ addons:
apt: apt:
packages: packages:
- clang-3.6 - clang-3.6
- ninja-build
install: install:
# Install ninja on Mac OS X.
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install ninja; fi
# Make sure that clang-3.6 is selected on Linux. # Make sure that clang-3.6 is selected on Linux.
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then
export CC=clang-3.6 CXX=clang++-3.6; export CC=clang-3.6 CXX=clang++-3.6;
...@@ -57,7 +54,7 @@ install: ...@@ -57,7 +54,7 @@ install:
fi fi
before_script: before_script:
- git clone https://github.com/google/googletest.git External/googletest - git clone --depth=1 https://github.com/google/googletest.git External/googletest
script: script:
- mkdir build && cd build - mkdir build && cd build
...@@ -68,14 +65,12 @@ script: ...@@ -68,14 +65,12 @@ script:
-DANDROID_NATIVE_API_LEVEL=android-12 -DANDROID_NATIVE_API_LEVEL=android-12
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_ABI="armeabi-v7a with NEON"
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF ..;
-GNinja ..; make -j4;
ninja;
else else
cmake -DCMAKE_BUILD_TYPE=${GLSLANG_BUILD_TYPE} cmake -DCMAKE_BUILD_TYPE=${GLSLANG_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=`pwd`/install -DCMAKE_INSTALL_PREFIX=`pwd`/install ..;
-GNinja ..; make -j4 install;
ninja install;
ctest --output-on-failure && ctest --output-on-failure &&
cd ../Test && ./runtests; cd ../Test && ./runtests;
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment