Repository: thrift
Updated Branches:
refs/heads/master 2e0531608 -> 7f9fa8831
THRIFT-3007 Travis build is broken because of directory conflict
Patch: Nobuaki Sukegawa
This closes #381
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/7f9fa883
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/7f9fa883
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/7f9fa883
Branch: refs/heads/master
Commit: 7f9fa8831f382cf3631acfb2ac8aa809459c4d95
Parents: 2e05316
Author: henrique <[email protected]>
Authored: Mon Feb 23 10:27:34 2015 +0800
Committer: henrique <[email protected]>
Committed: Mon Feb 23 10:27:34 2015 +0800
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/7f9fa883/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index cfa3c85..a5c728e 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
