diff --git a/.travis.yml b/.travis.yml index 1f3e37896..c1e568985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ env: before_script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update ; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cmake gcc g++ nodejs; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cmake gcc g++ nodejs ninja-build; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install ninja; fi script: - git stash --all @@ -44,4 +45,4 @@ after_script: deploy: provider: npm email: ${npm_email} - api_key: ${npm_token} \ No newline at end of file + api_key: ${npm_token} diff --git a/build.sh b/build.sh index 27c4e6711..ed7ccbe83 100755 --- a/build.sh +++ b/build.sh @@ -144,14 +144,14 @@ then rm -rf ./'Debug-build' mkdir ./'Debug-build' cd ./'Debug-build' - cmake -D CMAKE_BUILD_TYPE:STRING=Debug ../ + cmake -GNinja -D CMAKE_BUILD_TYPE:STRING=Debug ../ else rm -rf ./'Release-build' mkdir ./'Release-build' cd ./'Release-build' - cmake ../ + cmake -GNinja ../ fi -make -j4 +ninja -v ######## # Set up environment variables of SVF