diff options
| author | henrique <henrique@apache.org> | 2015-02-23 10:27:34 +0800 |
|---|---|---|
| committer | henrique <henrique@apache.org> | 2015-02-23 10:27:34 +0800 |
| commit | 7f9fa8831f382cf3631acfb2ac8aa809459c4d95 (patch) | |
| tree | bd5619ce960db4b04bfefe00f92da94eb0742e9a /.travis.yml | |
| parent | 2e0531608dfc40d5dd0bef250e7b1c805c06e8bc (diff) | |
| download | thrift-7f9fa8831f382cf3631acfb2ac8aa809459c4d95.tar.gz | |
THRIFT-3007 Travis build is broken because of directory conflict
Patch: Nobuaki Sukegawa
This closes #381
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index cfa3c85ac..a5c728e23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_install: - if [ "$ALL_DEPS" != "no" ] ; then cabal update ; fi script: - - if [ "x$CMAKE_CONFIG" != "xnone" ] ; then mkdir build && cd build && cmake -GNinja -DQT_MOC_EXECUTABLE="moq-qt5" $CMAKE_CONFIG $TRAVIS_BUILD_DIR ; fi + - if [ "x$CMAKE_CONFIG" != "xnone" ] ; then mkdir cmake_build && cd cmake_build && cmake -GNinja -DQT_MOC_EXECUTABLE="moq-qt5" $CMAKE_CONFIG $TRAVIS_BUILD_DIR ; fi - if [ "x$CMAKE_CONFIG" != "xnone" ] ; then ninja ; fi - if [ "x$CMAKE_CONFIG" != "xnone" ] ; then cpack ; cd $TRAVIS_BUILD_DIR ; fi - if [ "x$CONFIG" != "xnone" ] ; then sh bootstrap.sh ; fi |